[Python-checkins] cpython (merge default -> default): Head merge

[lukasz.langa]

http://hg.python.org/cpython/rev/9cccfaa6b534
changeset:   75555:9cccfaa6b534
parent:      75553:512d3ad81fb9
parent:      75554:5353357382e2
user:        Łukasz Langa <lukasz at langa.pl>
date:        Mon Mar 12 22:59:49 2012 +0100
summary:
  Head merge

files:
  Modules/_pickle.c |  11 ++++++++---
  1 files changed, 8 insertions(+), 3 deletions(-)


diff --git a/Modules/_pickle.c b/Modules/_pickle.c
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -2814,14 +2814,19 @@
 static int
 save_ellipsis(PicklerObject *self, PyObject *obj)
 {
-    return save_global(self, Py_Ellipsis, PyUnicode_FromString("Ellipsis"));
+    PyObject *str = PyUnicode_FromString("Ellipsis");
+    if (str == NULL)
+      return -1;
+    return save_global(self, Py_Ellipsis, str);
 }
 
 static int
 save_notimplemented(PicklerObject *self, PyObject *obj)
 {
-    return save_global(self, Py_NotImplemented,
-                       PyUnicode_FromString("NotImplemented"));
+    PyObject *str = PyUnicode_FromString("NotImplemented");
+    if (str == NULL)
+      return -1;
+    return save_global(self, Py_NotImplemented, str);
 }
 
 static int

-- 
Repository URL: http://hg.python.org/cpython