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

tismer at codespeak.net tismer at codespeak.net
Wed Aug 10 02:00:46 CEST 2005


Author: tismer
Date: Wed Aug 10 02:00:44 2005
New Revision: 15884

Modified:
   pypy/dist/pypy/objspace/std/objspace.py
Log:
sorryfor enabling the old marshal, too, by chance.
removed the oldgeninterp marshal support for this, completely.

Modified: pypy/dist/pypy/objspace/std/objspace.py
==============================================================================
--- pypy/dist/pypy/objspace/std/objspace.py	(original)
+++ pypy/dist/pypy/objspace/std/objspace.py	Wed Aug 10 02:00:44 2005
@@ -83,9 +83,6 @@
         self.w_instance = W_TypeObject(self, 'instance', [self.w_object], {})
         self.setup_old_style_classes()
 
-        # early bootstrap for marshal
-        self.sys.setmodule(self.setup_marshal())
-
         # fix up a problem where multimethods apparently don't 
         # like to define this at interp-level 
         self.appexec([self.w_dict], """
@@ -134,10 +131,6 @@
         self.w_classobj = w_classobj
         self.w_instance = w_instance
 
-    def setup_marshal(self):
-        w_mod, w_dic = self.create_builtin_module('_marshal.py', 'marshal')
-        return w_mod
-
     def create_builtin_module(self, pyname, publicname):
         """NOT_RPYTHON
         helper function which returns the wrapped module and its dict.



More information about the Pypy-commit mailing list