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

[fijal at codespeak.net]

Author: fijal
Date: Fri Apr 16 23:44:43 2010
New Revision: 73825

Modified:
   pypy/trunk/pypy/module/sys/__init__.py
   pypy/trunk/pypy/objspace/std/objspace.py
Log:
Move filesystemencoding init to sysmodule.init


Modified: pypy/trunk/pypy/module/sys/__init__.py
==============================================================================
--- pypy/trunk/pypy/module/sys/__init__.py	(original)
+++ pypy/trunk/pypy/module/sys/__init__.py	Fri Apr 16 23:44:43 2010
@@ -1,5 +1,6 @@
 from pypy.interpreter.mixedmodule import MixedModule 
 from pypy.interpreter.error import OperationError
+from pypy.module.sys.interp_encoding import _getfilesystemencoding
 
 class Module(MixedModule):
     """Sys Builtin Module. """
@@ -86,6 +87,9 @@
         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	Fri Apr 16 23:44:43 2010
@@ -367,11 +367,6 @@
             raise UnpackValueError("Expected length %d, got %d" % (expected_length, len(t)))
         return t
 
-    def startup(self):
-        from pypy.module.sys.interp_encoding import _getfilesystemencoding
-        ObjSpace.startup(self)
-        self.sys.filesystemencoding = _getfilesystemencoding(self)
-
     def sliceindices(self, w_slice, w_length):
         if isinstance(w_slice, W_SliceObject):
             a, b, c = w_slice.indices3(self, self.int_w(w_length))