Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: py3.5
Changeset: r89025:bdf046580d0a
Date: 2016-12-12 14:22 +0000
http://bitbucket.org/pypy/pypy/changeset/bdf046580d0a/
Log: Move qualname setting out of setup_*_type()
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
@@ -186,6 +186,14 @@
else:
layout = setup_user_defined_type(self, force_new_layout)
self.layout = layout
+ if self.flag_heaptype:
+ w_qualname = self.dict_w.pop('__qualname__', None)
+ if w_qualname is not None:
+ self.qualname = space.unicode_w(w_qualname)
+ else:
+ self.qualname = self.getname(space)
+ else:
+ self.qualname = self.getname(space)
if not is_mro_purely_of_types(self.mro_w):
pass
@@ -1178,12 +1186,6 @@
layout = create_all_slots(w_self, hasoldstylebase, w_bestbase,
force_new_layout)
- w_qualname = w_self.dict_w.pop('__qualname__', None)
- if w_qualname is not None:
- w_self.qualname = w_self.space.unicode_w(w_qualname)
- else:
- w_self.qualname = w_self.getname(w_self.space)
-
ensure_common_attributes(w_self)
return layout
@@ -1191,7 +1193,6 @@
w_self.hasdict = instancetypedef.hasdict
w_self.weakrefable = instancetypedef.weakrefable
w_self.w_doc = w_self.space.wrap(instancetypedef.doc)
- w_self.qualname = w_self.getname(w_self.space)
ensure_common_attributes(w_self)
w_self.flag_heaptype = instancetypedef.heaptype
#
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
