diff options
| -rw-r--r-- | Lib/pickle.py | 8 | ||||
| -rw-r--r-- | Lib/test/pickletester.py | 12 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Modules/_pickle.c | 21 |
4 files changed, 42 insertions, 0 deletions
diff --git a/Lib/pickle.py b/Lib/pickle.py index 20b3646..9e65368 100644 --- a/Lib/pickle.py +++ b/Lib/pickle.py @@ -438,6 +438,14 @@ class _Pickler: self.write(NONE) dispatch[type(None)] = save_none + def save_ellipsis(self, obj): + self.save_global(Ellipsis, 'Ellipsis') + dispatch[type(Ellipsis)] = save_ellipsis + + def save_notimplemented(self, obj): + self.save_global(NotImplemented, 'NotImplemented') + dispatch[type(NotImplemented)] = save_notimplemented + def save_bool(self, obj): if self.proto >= 2: self.write(obj and NEWTRUE or NEWFALSE) diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py index 1a551c8..3686a62 100644 --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -743,6 +743,18 @@ class AbstractPickleTests(unittest.TestCase): u = self.loads(s) self.assertEqual(t, u) + def test_ellipsis(self): + for proto in protocols: + s = self.dumps(..., proto) + u = self.loads(s) + self.assertEqual(..., u) + + def test_notimplemented(self): + for proto in protocols: + s = self.dumps(NotImplemented, proto) + u = self.loads(s) + self.assertEqual(NotImplemented, u) + # Tests for protocol 2 def test_proto(self): @@ -883,6 +883,7 @@ George Sakkis Rich Salz Kevin Samborn Adrian Sampson +James Sanders Ilya Sandler Mark Sapiro Ty Sarna diff --git a/Modules/_pickle.c b/Modules/_pickle.c index 2dc3a41..4212e7a 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -2812,6 +2812,19 @@ save_global(PicklerObject *self, PyObject *obj, PyObject *name) } static int +save_ellipsis(PicklerObject *self, PyObject *obj) +{ + return save_global(self, Py_Ellipsis, PyUnicode_FromString("Ellipsis")); +} + +static int +save_notimplemented(PicklerObject *self, PyObject *obj) +{ + return save_global(self, Py_NotImplemented, + PyUnicode_FromString("NotImplemented")); +} + +static int save_pers(PicklerObject *self, PyObject *obj, PyObject *func) { PyObject *pid = NULL; @@ -3114,6 +3127,14 @@ save(PicklerObject *self, PyObject *obj, int pers_save) status = save_none(self, obj); goto done; } + else if (obj == Py_Ellipsis) { + status = save_ellipsis(self, obj); + goto done; + } + else if (obj == Py_NotImplemented) { + status = save_notimplemented(self, obj); + goto done; + } else if (obj == Py_False || obj == Py_True) { status = save_bool(self, obj); goto done; |