Merged revisions 55795-55816 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
........
r55797 | neal.norwitz | 2007-06-07 00:00:57 -0700 (Thu, 07 Jun 2007) | 3 lines
Get rid of some remnants of classic classes. types.ClassType == type.
Also get rid of almost all uses of the types module and use the builtin name.
........
r55798 | neal.norwitz | 2007-06-07 00:12:36 -0700 (Thu, 07 Jun 2007) | 1 line
Remove a use of types, verify commit hook works
........
r55809 | guido.van.rossum | 2007-06-07 11:11:29 -0700 (Thu, 07 Jun 2007) | 2 lines
Fix syntax error introduced by Neal in last checkin.
........
diff --git a/Lib/pickletools.py b/Lib/pickletools.py
index b2c9599..000fc6b 100644
--- a/Lib/pickletools.py
+++ b/Lib/pickletools.py
@@ -1531,7 +1531,7 @@
opcode is followed by code to create setstate's argument, and then a
BUILD opcode to apply __setstate__ to that argument.
- If type(callable) is not ClassType, REDUCE complains unless the
+ If not isinstance(callable, type), REDUCE complains unless the
callable has been registered with the copy_reg module's
safe_constructors dict, or the callable has a magic
'__safe_for_unpickling__' attribute with a true value. I'm not sure
@@ -1587,9 +1587,6 @@
+ The argtuple is empty (markobject was at the top of the stack
at the start).
- + It's an old-style class object (the type of the class object is
- ClassType).
-
+ The class object does not have a __getinitargs__ attribute.
then we want to create an old-style class instance without invoking