Author: Matti Picus <matti.pi...@gmail.com>
Branch: py3.6
Changeset: r96316:605f74b0221c
Date: 2019-03-14 17:18 +0200
http://bitbucket.org/pypy/pypy/changeset/605f74b0221c/
Log: merge default into branch
diff --git a/pypy/module/cpyext/test/test_tupleobject.py
b/pypy/module/cpyext/test/test_tupleobject.py
--- a/pypy/module/cpyext/test/test_tupleobject.py
+++ b/pypy/module/cpyext/test/test_tupleobject.py
@@ -231,7 +231,6 @@
# issue 2968: creating a subclass of tuple in C led to recursion
# since the default tp_new needs to build a w_obj, but that needs
# to call space.len_w, which needs to call tp_new.
- module = self.import_module('THPSize')
module = self.import_extension('foo', [
("get_size", "METH_NOARGS",
"""
@@ -266,4 +265,5 @@
SZ = module.get_size()
s = SZ((1, 2, 3))
assert len(s) == 3
+ assert len(s) == 3
diff --git a/rpython/rlib/test/test_rawrefcount_boehm.py
b/rpython/rlib/test/test_rawrefcount_boehm.py
--- a/rpython/rlib/test/test_rawrefcount_boehm.py
+++ b/rpython/rlib/test/test_rawrefcount_boehm.py
@@ -111,7 +111,7 @@
pyobjs.append(varname)
return varname
- for op in draw(strategies.lists(operations, average_size=250)):
+ for op in draw(strategies.lists(operations)):
if op == 'new_gcobj':
new_gcobj()
elif op == 'new_pyobj':
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
