Author: Antonio Cuni <[email protected]>
Branch: py3k
Changeset: r58180:11b6adfbf682
Date: 2012-10-17 18:25 +0200
http://bitbucket.org/pypy/pypy/changeset/11b6adfbf682/
Log: long is no longer there in py3k (sorry for the word play)
diff --git a/pypy/objspace/std/complextype.py b/pypy/objspace/std/complextype.py
--- a/pypy/objspace/std/complextype.py
+++ b/pypy/objspace/std/complextype.py
@@ -185,7 +185,6 @@
# __complex__() must return a complex or (float,int,long) object
# (XXX should not use isinstance here)
if (space.isinstance_w(w_z, space.w_int) or
- space.isinstance_w(w_z, space.w_long) or
space.isinstance_w(w_z, space.w_float)):
return (space.float_w(w_z), 0.0)
elif isinstance(w_z, W_ComplexObject):
diff --git a/pypy/objspace/std/test/test_complexobject.py
b/pypy/objspace/std/test/test_complexobject.py
--- a/pypy/objspace/std/test/test_complexobject.py
+++ b/pypy/objspace/std/test/test_complexobject.py
@@ -251,8 +251,6 @@
assert complex(NS(2.0)) == 2+0j
assert complex(OS(2)) == 2+0j
assert complex(NS(2)) == 2+0j
- assert complex(OS(2L)) == 2+0j
- assert complex(NS(2L)) == 2+0j
raises(TypeError, complex, OS(None))
raises(TypeError, complex, NS(None))
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
