Author: Ronan Lamy <[email protected]>
Branch: py3.7
Changeset: r97926:efacfd8fec99
Date: 2019-11-01 16:59 +0000
http://bitbucket.org/pypy/pypy/changeset/efacfd8fec99/
Log: fix bad merge
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
@@ -296,8 +296,6 @@
return tuple(super().items())
dict_obj = {'foo': 1, 'bar': 2, 'spam': 3}
[email protected](support.check_impl_detail(pypy=True),
- 'Py_AddPendingCall not currently supported.')
for mapping in [{}, OrderedDict(), Mapping1(), Mapping2(),
dict_obj, OrderedDict(dict_obj),
Mapping1(dict_obj), Mapping2(dict_obj)]:
@@ -326,6 +324,8 @@
self.assertRaises(TypeError, _testcapi.get_mapping_items, bad_mapping)
[email protected](support.check_impl_detail(pypy=True),
+ 'Py_AddPendingCall not currently supported.')
class TestPendingCalls(unittest.TestCase):
def pendingcalls_submit(self, l, n):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
