[pypy-commit] pypy win64-stage1: Merge

[ctismer]

Author: Christian Tismer <tismer at stackless.com>
Branch: win64-stage1
Changeset: r49760:a3e74b838add
Date: 2011-11-24 22:43 +0100
http://bitbucket.org/pypy/pypy/changeset/a3e74b838add/

Log:	Merge

diff --git a/pypy/interpreter/astcompiler/test/test_compiler.py b/pypy/interpreter/astcompiler/test/test_compiler.py
--- a/pypy/interpreter/astcompiler/test/test_compiler.py
+++ b/pypy/interpreter/astcompiler/test/test_compiler.py
@@ -58,7 +58,8 @@
         w_res = pyco_expr.exec_host_bytecode(w_dict, w_dict)
         res = space.str_w(space.repr(w_res))
         if not isinstance(expected, float):
-            assert res == repr(expected)
+            noL = lambda expr: expr.replace('L', '')
+            assert noL(res) == noL(repr(expected))
         else:
             # Float representation can vary a bit between interpreter
             # versions, compare the numbers instead.
diff --git a/pypy/jit/metainterp/history.py b/pypy/jit/metainterp/history.py
--- a/pypy/jit/metainterp/history.py
+++ b/pypy/jit/metainterp/history.py
@@ -269,6 +269,7 @@
     def __init__(self, value):
         if not we_are_translated():
             if isinstance(value, (int, long)):
+            if isinstance(value, (int, long)):
                 value = int(value)    # bool -> int
             else:
                 assert isinstance(value, Symbolic)
diff --git a/pypy/rlib/rarithmetic.py b/pypy/rlib/rarithmetic.py
--- a/pypy/rlib/rarithmetic.py
+++ b/pypy/rlib/rarithmetic.py
@@ -92,7 +92,7 @@
 We therefore can no longer use the int type as it is, but need
 to use long everywhere.
 """
-
+    
 def intmask(n):
     if isinstance(n, objectmodel.Symbolic):
         return n        # assume Symbolics don't overflow