[pypy-commit] pypy py3.5: merge default into py3.5

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.5
Changeset: r93794:5c20792cdaa9
Date: 2018-02-09 16:28 -0500
http://bitbucket.org/pypy/pypy/changeset/5c20792cdaa9/

Log:	merge default into py3.5

diff --git a/rpython/memory/gctypelayout.py b/rpython/memory/gctypelayout.py
--- a/rpython/memory/gctypelayout.py
+++ b/rpython/memory/gctypelayout.py
@@ -97,7 +97,7 @@
 
     def q_destructor_or_custom_trace(self, typeid):
         if not self.get(typeid).customdata:
-            return lltype.nullptr(GCData.CUSTOM_DATA_STRUCT)
+            return lltype.nullptr(GCData.CUSTOM_FUNC_PTR.TO)
         return self.get(typeid).customdata.customfunc
 
     def q_is_old_style_finalizer(self, typeid):
diff --git a/rpython/translator/c/test/test_newgc.py b/rpython/translator/c/test/test_newgc.py
--- a/rpython/translator/c/test/test_newgc.py
+++ b/rpython/translator/c/test/test_newgc.py
@@ -573,7 +573,7 @@
             return compute_hash(x)
         for size in ([random.randrange(0, 260) for i in range(10)] +
                      [random.randrange(260, 60000)]):
-            print 'PREBUILT DICTIONARY OF SIZE', size
+            #print 'PREBUILT DICTIONARY OF SIZE', size
             keys = [X() for j in range(size)]
             d = r_dict(keq, khash)
             for j in range(size):