diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/copyreg.py | 2 | ||||
| -rw-r--r-- | Lib/pickle.py | 2 | ||||
| -rw-r--r-- | Lib/pickletools.py | 4 | ||||
| -rw-r--r-- | Lib/test/test___all__.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Lib/copyreg.py b/Lib/copyreg.py index db1715092c..bf8827e3c0 100644 --- a/Lib/copyreg.py +++ b/Lib/copyreg.py @@ -13,7 +13,7 @@ dispatch_table = {} def pickle(ob_type, pickle_function, constructor_ob=None): if type(ob_type) is _ClassType: - raise TypeError("copy_reg is not intended for use with classes") + raise TypeError("copyreg is not intended for use with classes") if not hasattr(pickle_function, '__call__'): raise TypeError("reduction functions must be callable") diff --git a/Lib/pickle.py b/Lib/pickle.py index 1e91eef28b..ddb2c81490 100644 --- a/Lib/pickle.py +++ b/Lib/pickle.py @@ -1,7 +1,7 @@ """Create portable serialized representations of Python objects. See module cPickle for a (much) faster implementation. -See module copy_reg for a mechanism for registering custom picklers. +See module copyreg for a mechanism for registering custom picklers. See module pickletools source for extensive comments. Classes: diff --git a/Lib/pickletools.py b/Lib/pickletools.py index ae02a36103..623dd16bf4 100644 --- a/Lib/pickletools.py +++ b/Lib/pickletools.py @@ -136,7 +136,7 @@ this and there isn't a use case that warrants the expense of such an analysis. To this end, all tests for __safe_for_unpickling__ or for -copy_reg.safe_constructors are removed from the unpickling code. +copyreg.safe_constructors are removed from the unpickling code. References to these variables in the descriptions below are to be seen as describing unpickling in Python 2.2 and before. """ @@ -1525,7 +1525,7 @@ opcodes = [ BUILD opcode to apply __setstate__ to that argument. If type(callable) is not ClassType, REDUCE complains unless the - callable has been registered with the copy_reg module's + callable has been registered with the copyreg module's safe_constructors dict, or the callable has a magic '__safe_for_unpickling__' attribute with a true value. I'm not sure why it does this, but I've sure seen this complaint often enough when diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py index eaa9c25049..3b6d966f0b 100644 --- a/Lib/test/test___all__.py +++ b/Lib/test/test___all__.py @@ -40,7 +40,7 @@ class AllTest(unittest.TestCase): self.check_all("configparser") self.check_all("Cookie") self.check_all("MimeWriter") - self.check_all("Queue") + self.check_all("queue") self.check_all("SimpleHTTPServer") self.check_all("socketserver") self.check_all("StringIO") |