Author: Philip Jenvey <pjen...@underboss.org>
Branch: py3.3
Changeset: r74269:27d01c9572b0
Date: 2014-10-28 13:40 -0700
http://bitbucket.org/pypy/pypy/changeset/27d01c9572b0/
Log: merge py3k
diff --git a/pypy/module/select/test/test_select.py
b/pypy/module/select/test/test_select.py
--- a/pypy/module/select/test/test_select.py
+++ b/pypy/module/select/test/test_select.py
@@ -310,7 +310,6 @@
import select
class Foo(object):
def fileno(self):
- print len(l)
if len(l) < 100:
l.append(Foo())
return 0
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
@@ -198,12 +198,12 @@
assert large != (5+0j)
def test_richcompare_numbers(self):
- for n in 8, 8L, 0.01:
+ for n in 8, 0.01:
assert complex.__eq__(n+0j, n)
assert not complex.__ne__(n+0j, n)
assert not complex.__eq__(complex(n, n), n)
assert complex.__ne__(complex(n, n), n)
- raises(TypeError, complex.__lt__, n+0j, n)
+ assert complex.__lt__(n+0j, n) is NotImplemented
def test_richcompare_boundaries(self):
z = 9007199254740992+0j
diff --git a/rpython/jit/backend/llsupport/assembler.py
b/rpython/jit/backend/llsupport/assembler.py
--- a/rpython/jit/backend/llsupport/assembler.py
+++ b/rpython/jit/backend/llsupport/assembler.py
@@ -225,7 +225,8 @@
raise AssertionError(kind)
gcref = cast_instance_to_gcref(value)
- rgc._make_sure_does_not_move(gcref)
+ if gcref:
+ rgc._make_sure_does_not_move(gcref)
value = rffi.cast(lltype.Signed, gcref)
je_location = self._call_assembler_check_descr(value, tmploc)
#
diff --git a/rpython/rlib/rgc.py b/rpython/rlib/rgc.py
--- a/rpython/rlib/rgc.py
+++ b/rpython/rlib/rgc.py
@@ -63,10 +63,13 @@
"""Unpin 'obj', allowing it to move again.
Must only be called after a call to pin(obj) returned True.
"""
- for i in range(len(_pinned_objects)):
+ i = 0
+ while i < len(_pinned_objects):
try:
if _pinned_objects[i] == obj:
del _pinned_objects[i]
+ else:
+ i += 1
except TypeError:
pass
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
