1. Pypy
  2. Untitled project
  3. pypy

Commits

Armin Rigo  committed 2fc954d

Simplify the custom logic to pickle module dictionary (as per Stackless
Python). Now it should only work with normal, imported,
correctly-__name__ed modules, without needing to walk all of
sys.modules.

Comments (0)

Files changed (1)

File lib-python/2.7/pickle.py Modified

View file
  • Ignore whitespace
  • Hide word diff
             # else tmp is empty, and we're done
 
     def save_dict(self, obj):
-        modict_saver = self._pickle_moduledict(obj)
+        modict_saver = self._pickle_maybe_moduledict(obj)
         if modict_saver is not None:
             return self.save_reduce(*modict_saver)
 
                 write(SETITEM)
             # else tmp is empty, and we're done
 
-    def _pickle_moduledict(self, obj):
+    def _pickle_maybe_moduledict(self, obj):
         # save module dictionary as "getattr(module, '__dict__')"
-
-        # build index of module dictionaries
         try:
-            modict = self.module_dict_ids
-        except AttributeError:
-            modict = {}
-            from sys import modules
-            for mod in modules.values():
-                if isinstance(mod, ModuleType):
-                    modict[id(mod.__dict__)] = mod
-            self.module_dict_ids = modict
+            themodule = sys.modules[obj['__name__']]
+            if type(themodule) is not ModuleType:
+                return None
+            if themodule.__dict__ is not obj:
+                return None
+        except (AttributeError, KeyError, TypeError):
+            return None
 
-        thisid = id(obj)
-        try:
-            themodule = modict[thisid]
-        except KeyError:
-            return None
-        from __builtin__ import getattr
         return getattr, (themodule, '__dict__')