summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1997-09-12 20:07:24 (GMT)
committerGuido van Rossum <guido@python.org>1997-09-12 20:07:24 (GMT)
commit4fb5b28dfc15ab09412bc8307157d665c43716f4 (patch)
treec56f3fc4038d1b7004ef9c1ce3d3186cf80b5b55 /Lib
parent7cc56eb524dd83e3ba9d76accec3b0fe4010a48a (diff)
downloadcpython-4fb5b28dfc15ab09412bc8307157d665c43716f4.zip
cpython-4fb5b28dfc15ab09412bc8307157d665c43716f4.tar.gz
cpython-4fb5b28dfc15ab09412bc8307157d665c43716f4.tar.bz2
Three independent changes:
- Don't use "from copy_reg import *". - Use cls.__module__ instead of calling whichobject(cls, cls.__name__); also try __module__ in whichmodule(), just in case. - After calling save_reduce(), add the object to the memo.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/pickle.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/Lib/pickle.py b/Lib/pickle.py
index 7458792..a38f4f6 100644
--- a/Lib/pickle.py
+++ b/Lib/pickle.py
@@ -131,7 +131,7 @@ I have no answers. Garbage Collection may also become a problem here.)
__version__ = "1.8" # Code version
from types import *
-from copy_reg import *
+from copy_reg import dispatch_table, safe_constructors
import string, marshal
format_version = "1.2" # File format version we write
@@ -290,6 +290,9 @@ class Pickler:
"by %s must be a tuple" % reduce
self.save_reduce(callable, arg_tup, state)
+ memo_len = len(memo)
+ self.write(self.put(memo_len))
+ memo[d] = (memo_len, object)
return
f(self, object)
@@ -489,9 +492,7 @@ class Pickler:
if (self.bin):
write(OBJ + self.put(memo_len))
else:
- module = whichmodule(cls, cls.__name__)
- name = cls.__name__
- write(INST + module + '\n' + name + '\n' +
+ write(INST + cls.__module__ + '\n' + cls.__name__ + '\n' +
self.put(memo_len))
memo[d] = (memo_len, object)
@@ -514,7 +515,10 @@ class Pickler:
if (name is None):
name = object.__name__
- module = whichmodule(object, name)
+ try:
+ module = object.__module__
+ except AttributeError:
+ module = whichmodule(object, name)
memo_len = len(memo)
write(GLOBAL + module + '\n' + name + '\n' +
@@ -544,6 +548,7 @@ def _keep_alive(x, memo):
classmap = {}
+# This is no longer used to find classes, but still for functions
def whichmodule(cls, clsname):
"""Figure out the module in which a class occurs.