Author: Christian Tismer <[email protected]>
Branch: win64-stage1
Changeset: r49761:bd1ef1e7450f
Date: 2011-11-24 22:50 +0100
http://bitbucket.org/pypy/pypy/changeset/bd1ef1e7450f/
Log: removed a merge glitch
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,7 +269,6 @@
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)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
