[pypy-svn] r5032 - pypy/trunk/src/pypy/objspace/std

[arigo at codespeak.net]

Author: arigo
Date: Thu Jun 10 18:25:31 2004
New Revision: 5032

Modified:
   pypy/trunk/src/pypy/objspace/std/objspace.py
Log:
Minor clean-ups.


Modified: pypy/trunk/src/pypy/objspace/std/objspace.py
==============================================================================
--- pypy/trunk/src/pypy/objspace/std/objspace.py	(original)
+++ pypy/trunk/src/pypy/objspace/std/objspace.py	Thu Jun 10 18:25:31 2004
@@ -140,11 +140,12 @@
         import typeobject
         import sliceobject
         import longobject
+        import noneobject
 	import cpythonobject
 	# hack to avoid imports in the time-critical functions below
         global W_ObjectObject, W_BoolObject, W_IntObject, W_FloatObject
 	global W_TupleObject, W_ListObject, W_DictObject, W_StringObject
-	global W_TypeObject, W_SliceObject, W_LongObject
+	global W_TypeObject, W_SliceObject, W_LongObject, W_NoneObject
 	global W_CPythonObject, W_BuiltinFunctionObject
 	W_ObjectObject = objectobject.W_ObjectObject
 	W_BoolObject = boolobject.W_BoolObject
@@ -157,13 +158,11 @@
 	W_TypeObject = typeobject.W_TypeObject
 	W_SliceObject = sliceobject.W_SliceObject
 	W_LongObject = longobject.W_LongObject
+        W_NoneObject = noneobject.W_NoneObject
 	W_CPythonObject = cpythonobject.W_CPythonObject
 	W_BuiltinFunctionObject = cpythonobject.W_BuiltinFunctionObject
         # end of hacks
 
-        from noneobject    import W_NoneObject
-        from boolobject    import W_BoolObject
-
         # singletons
         self.w_None  = W_NoneObject(self)
         self.w_False = W_BoolObject(self, False)