[pypy-svn] r15201 - pypy/dist/pypy/interpreter

pedronis at codespeak.net pedronis at codespeak.net
Wed Jul 27 19:12:55 CEST 2005


Author: pedronis
Date: Wed Jul 27 19:12:32 2005
New Revision: 15201

Modified:
   pypy/dist/pypy/interpreter/baseobjspace.py
Log:
list marshal builtin module



Modified: pypy/dist/pypy/interpreter/baseobjspace.py
==============================================================================
--- pypy/dist/pypy/interpreter/baseobjspace.py	(original)
+++ pypy/dist/pypy/interpreter/baseobjspace.py	Wed Jul 27 19:12:32 2005
@@ -141,7 +141,7 @@
             return self._builtinmodule_list
         except AttributeError:
             builtinmodule_list = [('sys', None), ('__builtin__', None),
-                                  ('exceptions', None)]
+                                  ('exceptions', None), ('marshal', None)]
             builtinmodule_list.append(('unicodedata', None))
             #  Uncomment the following line to enable the builtin _codecs module
             builtinmodule_list.append(('_codecs', None))
@@ -172,7 +172,7 @@
         self.setitem(self.builtin.w_dict, self.wrap('__builtins__'), w_builtin) 
 
         for modname, mixedname in self.get_builtinmodule_list():
-            if modname not in ('sys', '__builtin__', 'exceptions'):
+            if modname not in ('sys', '__builtin__', 'exceptions', 'marshal'):
                 self.setbuiltinmodule(modname, mixedname)
         
         # initialize with "bootstrap types" from objspace  (e.g. w_None)



More information about the Pypy-commit mailing list