[pypy-svn] r73827 - in pypy/trunk/pypy: module/sys objspace/std

[fijal at codespeak.net]

Author: fijal
Date: Sat Apr 17 19:12:48 2010
New Revision: 73827

Modified:
   pypy/trunk/pypy/module/sys/__init__.py
   pypy/trunk/pypy/objspace/std/objspace.py
Log:
give up on being nice and move initialization to StdObjSpace.startup.
The sys module init is called way too early, during objspace initialization


Modified: pypy/trunk/pypy/module/sys/__init__.py
==============================================================================
--- pypy/trunk/pypy/module/sys/__init__.py	(original)
+++ pypy/trunk/pypy/module/sys/__init__.py	Sat Apr 17 19:12:48 2010
@@ -87,9 +87,6 @@
         w_modules = self.get('modules')
         self.space.setitem(w_modules, w_name, w_module)
 
-    def init(self, space):
-        self.filesystemencoding = _getfilesystemencoding(space)
-
     def getmodule(self, name): 
         space = self.space
         w_modules = self.get('modules') 

Modified: pypy/trunk/pypy/objspace/std/objspace.py
==============================================================================
--- pypy/trunk/pypy/objspace/std/objspace.py	(original)
+++ pypy/trunk/pypy/objspace/std/objspace.py	Sat Apr 17 19:12:48 2010
@@ -84,6 +84,13 @@
         if self.config.objspace.std.withtproxy:
             transparent.setup(self)
 
+    def startup(self):
+        from pypy.module.sys.interp_encoding import _getfilesystemencoding
+
+        ObjSpace.startup(self)
+        self.sys.filesystemencoding = _getfilesystemencoding(self)
+
+
     def get_builtin_types(self):
         return self.builtin_types