[pypy-commit] pypy kill-multimethod: Move std_dict_descr to pypy.interpreter.typedef.

[Manuel Jacob]

Author: Manuel Jacob
Branch: kill-multimethod
Changeset: r69443:738f370ede8a
Date: 2014-02-25 19:02 +0100
http://bitbucket.org/pypy/pypy/changeset/738f370ede8a/

Log:	Move std_dict_descr to pypy.interpreter.typedef.

diff --git a/pypy/interpreter/typedef.py b/pypy/interpreter/typedef.py
--- a/pypy/interpreter/typedef.py
+++ b/pypy/interpreter/typedef.py
@@ -617,6 +617,7 @@
 from pypy.interpreter.nestedscope import Cell
 from pypy.interpreter.special import NotImplemented, Ellipsis
 
+
 def descr_get_dict(space, w_obj):
     w_dict = w_obj.getdict(space)
     if w_dict is None:
@@ -637,6 +638,11 @@
         return space.w_None
     return lifeline.get_any_weakref(space)
 
+dict_descr = GetSetProperty(descr_get_dict, descr_set_dict, descr_del_dict,
+                            doc="dictionary for instance variables (if defined)")
+dict_descr.name = '__dict__'
+
+
 def generic_ne(space, w_obj1, w_obj2):
     if space.eq_w(w_obj1, w_obj2):
         return space.w_False
diff --git a/pypy/objspace/std/stdtypedef.py b/pypy/objspace/std/stdtypedef.py
--- a/pypy/objspace/std/stdtypedef.py
+++ b/pypy/objspace/std/stdtypedef.py
@@ -1,6 +1,4 @@
 from pypy.interpreter.typedef import TypeDef, GetSetProperty, Member
-from pypy.interpreter.typedef import descr_get_dict, descr_set_dict
-from pypy.interpreter.typedef import descr_del_dict
 from pypy.interpreter.baseobjspace import SpaceCache
 
 __all__ = ['StdTypeDef']
@@ -9,11 +7,6 @@
 StdTypeDef = TypeDef
 
 
-std_dict_descr = GetSetProperty(descr_get_dict, descr_set_dict, descr_del_dict,
-                    doc="dictionary for instance variables (if defined)")
-std_dict_descr.name = '__dict__'
-
-
 class TypeCache(SpaceCache):
     def build(cache, typedef):
         "NOT_RPYTHON: initialization-time only."
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
@@ -3,9 +3,9 @@
 from pypy.interpreter.error import oefmt, OperationError
 from pypy.interpreter.function import Function, StaticMethod
 from pypy.interpreter.typedef import weakref_descr, GetSetProperty,\
-     descr_get_dict
+     descr_get_dict, dict_descr
 from pypy.interpreter.astcompiler.misc import mangle
-from pypy.objspace.std.stdtypedef import std_dict_descr, Member
+from pypy.objspace.std.stdtypedef import Member
 from pypy.objspace.std.stdtypedef import StdTypeDef
 
 from rpython.rlib.jit import (promote, elidable_promote, we_are_jitted,
@@ -1032,7 +1032,7 @@
 def create_dict_slot(w_self):
     if not w_self.hasdict:
         w_self.dict_w.setdefault('__dict__',
-                                 w_self.space.wrap(std_dict_descr))
+                                 w_self.space.wrap(dict_descr))
         w_self.hasdict = True
 
 def create_weakref_slot(w_self):