Make BadPickleGet a class. Fixes #609164.

diff --git a/Misc/NEWS b/Misc/NEWS
index e1e0104f0e2d8e9583e2dc49486b3045856580b4..613c8a73e6b40a0c0b1909ad1ed267cadd86fc02 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -274,6 +274,8 @@ Core and builtins
 
 Extension modules
 
+- cPickle.BadPickleGet is now a class.
+
 - The time stamps in os.stat_result are floating point numbers now.
 
 - If the size passed to mmap.mmap() is larger than the length of the

diff --git a/Modules/cPickle.c b/Modules/cPickle.c
index 14936a6805c648be8f75fd3cd503e7c74dbd2bdc..32fdd6ed76860abce93ae9cdc9aae9fb2869d254 100644 (file)
--- a/Modules/cPickle.c
+++ b/Modules/cPickle.c
@@ -4760,6 +4760,10 @@ init_stuff(PyObject *module_dict)
                                                    PickleError, NULL))) 
                return -1;
 
+        if (!( BadPickleGet = PyErr_NewException("cPickle.BadPickleGet",
+                                                UnpicklingError, NULL)))
+                return -1;
+ 
        if (PyDict_SetItemString(module_dict, "PickleError",
                                 PickleError) < 0)
                return -1;
@@ -4776,9 +4780,6 @@ init_stuff(PyObject *module_dict)
                                 UnpickleableError) < 0)
                return -1;
 
-       if (!( BadPickleGet = PyString_FromString("cPickle.BadPickleGet"))) 
-               return -1;
-
        if (PyDict_SetItemString(module_dict, "BadPickleGet",
                                 BadPickleGet) < 0)
                return -1;