Author: Manuel Jacob <m...@manueljacob.de>
Branch: py3.3
Changeset: r82608:f4302aeafbb3
Date: 2016-02-29 02:26 +0100
http://bitbucket.org/pypy/pypy/changeset/f4302aeafbb3/
Log: hg merge py3k
diff --git a/lib-python/3/test/test_capi.py b/lib-python/3/test/test_capi.py
--- a/lib-python/3/test/test_capi.py
+++ b/lib-python/3/test/test_capi.py
@@ -213,7 +213,10 @@
# Bug #6012
class Test6012(unittest.TestCase):
def test(self):
- self.assertEqual(_testcapi.argparsing("Hello", "World"), 1)
+ # PyPy change: Mask out higher bits of reference count. PyPy increases
+ # the reference count by a high number if the object is linked to a
+ # PyPy object.
+ self.assertEqual(_testcapi.argparsing("Hello", "World") & 0xfffffff, 1)
class EmbeddingTest(unittest.TestCase):
diff --git a/pypy/module/_continuation/test/test_zpickle.py
b/pypy/module/_continuation/test/test_zpickle.py
--- a/pypy/module/_continuation/test/test_zpickle.py
+++ b/pypy/module/_continuation/test/test_zpickle.py
@@ -1,6 +1,9 @@
import py
+py.test.skip("XXX: crashes: https://bitbucket.org/pypy/pypy/issue/1773";)
+
+
class AppTestCopy:
spaceconfig = dict(usemodules=['_continuation'],
continuation=True)
@@ -215,7 +218,6 @@
''', mod.__dict__)
def test_pickle_continulet_real_subclass(self):
- skip("XXX: triggers a crash:
https://bitbucket.org/pypy/pypy/issue/1773";)
import types, sys
mod = types.ModuleType('test_pickle_continulet_real_subclass')
sys.modules['test_pickle_continulet_real_subclass'] = mod
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
