[pypy-svn] r19065 - pypy/dist/pypy/objspace/std

[mwh at codespeak.net]

Author: mwh
Date: Thu Oct 27 12:23:24 2005
New Revision: 19065

Modified:
   pypy/dist/pypy/objspace/std/dump_multimethod.py
   pypy/dist/pypy/objspace/std/listtype.py
   pypy/dist/pypy/objspace/std/objecttype.py
   pypy/dist/pypy/objspace/std/typetype.py
   pypy/dist/pypy/objspace/std/unicodetype.py
Log:
some more explicit imports of gateway


Modified: pypy/dist/pypy/objspace/std/dump_multimethod.py
==============================================================================
--- pypy/dist/pypy/objspace/std/dump_multimethod.py	(original)
+++ pypy/dist/pypy/objspace/std/dump_multimethod.py	Thu Oct 27 12:23:24 2005
@@ -23,7 +23,6 @@
 
 def import_implementations():
     # populate the multimethod tables by importing all object implementations
-    from pypy.objspace.std import default
     result = []
     for fullpath in IMPLEMENTATIONS:
         i = fullpath.rfind('.')

Modified: pypy/dist/pypy/objspace/std/listtype.py
==============================================================================
--- pypy/dist/pypy/objspace/std/listtype.py	(original)
+++ pypy/dist/pypy/objspace/std/listtype.py	Thu Oct 27 12:23:24 2005
@@ -1,4 +1,5 @@
 from __future__ import generators
+from pypy.interpreter import gateway
 from pypy.objspace.std.stdtypedef import *
 from pypy.objspace.std.register_all import register_all
 from sys import maxint
@@ -14,7 +15,6 @@
 list_sort     = StdObjSpaceMultiMethod('sort',   4, defaults=(None, None, False), argnames=['cmp', 'key', 'reverse'])
 list_reversed = StdObjSpaceMultiMethod('__reversed__', 1)
 ##
-### gateway is imported in the stdtypedef module
 ##list_reversed__ANY = gateway.applevel('''
 ##    # NOT_RPYTHON -- uses yield
 ##

Modified: pypy/dist/pypy/objspace/std/objecttype.py
==============================================================================
--- pypy/dist/pypy/objspace/std/objecttype.py	(original)
+++ pypy/dist/pypy/objspace/std/objecttype.py	Thu Oct 27 12:23:24 2005
@@ -1,5 +1,6 @@
 from pypy.interpreter.error import OperationError
 from pypy.objspace.descroperation import Object
+from pypy.interpreter import gateway
 from pypy.objspace.std.stdtypedef import *
 from pypy.objspace.std.register_all import register_all
 from pypy.objspace.std.objspace import StdObjSpace

Modified: pypy/dist/pypy/objspace/std/typetype.py
==============================================================================
--- pypy/dist/pypy/objspace/std/typetype.py	(original)
+++ pypy/dist/pypy/objspace/std/typetype.py	Thu Oct 27 12:23:24 2005
@@ -1,4 +1,5 @@
 from pypy.interpreter.error import OperationError
+from pypy.interpreter import gateway
 from pypy.objspace.std.stdtypedef import *
 
 def descr__new__(space, w_typetype, w_name, w_bases, w_dict):

Modified: pypy/dist/pypy/objspace/std/unicodetype.py
==============================================================================
--- pypy/dist/pypy/objspace/std/unicodetype.py	(original)
+++ pypy/dist/pypy/objspace/std/unicodetype.py	Thu Oct 27 12:23:24 2005
@@ -1,3 +1,4 @@
+from pypy.interpreter import gateway
 from pypy.objspace.std.stdtypedef import *
 from pypy.objspace.std.basestringtype import basestring_typedef
 from pypy.interpreter.error import OperationError