[pypy-svn] r28845 - pypy/dist/lib-python/modified-2.4.1

mwh at codespeak.net mwh at codespeak.net
Thu Jun 15 19:31:57 CEST 2006


Author: mwh
Date: Thu Jun 15 19:31:56 2006
New Revision: 28845

Modified:
   pypy/dist/lib-python/modified-2.4.1/pickle.py
Log:
an obscure fix for the "prickelpit vs the pylib" fight


Modified: pypy/dist/lib-python/modified-2.4.1/pickle.py
==============================================================================
--- pypy/dist/lib-python/modified-2.4.1/pickle.py	(original)
+++ pypy/dist/lib-python/modified-2.4.1/pickle.py	Thu Jun 15 19:31:56 2006
@@ -221,7 +221,11 @@
             from sys import modules
             for mod in modules.values():
                 if isinstance(mod, ModuleType):
-                    modict[id(mod.__dict__)] = mod
+                    try:
+                        modict[id(mod.__dict__)] = mod
+                    except: # obscure: the above can fail for
+                            # arbitrary reasons, because of the py lib
+                        pass
             self.module_dict_ids = modict
     		
         thisid = id(obj)



More information about the Pypy-commit mailing list