[pypy-commit] pypy default: (antocuni, arigo)

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r92507:075a4ef2fb28
Date: 2017-09-29 17:48 +0200
http://bitbucket.org/pypy/pypy/changeset/075a4ef2fb28/

Log:	(antocuni, arigo)

	oops, fix for 3f4fc7771154 (some tests in cpyext fail)

diff --git a/pypy/objspace/std/typeobject.py b/pypy/objspace/std/typeobject.py
--- a/pypy/objspace/std/typeobject.py
+++ b/pypy/objspace/std/typeobject.py
@@ -670,6 +670,7 @@
         from pypy.module.cpyext.typeobject import is_tp_new_wrapper
 
         if (isinstance(w_newdescr, W_PyCFunctionObject) and
+                w_newtype is not self and
                 is_tp_new_wrapper(self.space, w_newdescr.ml)):
             w_bestbase = find_best_base(self.bases_w)
             return w_bestbase.lookup_where('__new__')