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

[alexandre.vassalotti]

http://hg.python.org/cpython/rev/7bf4aca65ba2
changeset:   83341:7bf4aca65ba2
parent:      83338:3030b7fcf117
parent:      83340:a295decb8ed7
user:        Alexandre Vassalotti <alexandre at peadrop.com>
date:        Sun Apr 14 02:11:16 2013 -0700
summary:
  Merge 3.3

files:
  Modules/_pickle.c |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Modules/_pickle.c b/Modules/_pickle.c
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -2992,7 +2992,7 @@
     if (listitems == Py_None)
         listitems = NULL;
     else if (!PyIter_Check(listitems)) {
-        PyErr_Format(PicklingError, "Fourth element of tuple"
+        PyErr_Format(PicklingError, "fourth element of the tuple "
                      "returned by __reduce__ must be an iterator, not %s",
                      Py_TYPE(listitems)->tp_name);
         return -1;
@@ -3001,7 +3001,7 @@
     if (dictitems == Py_None)
         dictitems = NULL;
     else if (!PyIter_Check(dictitems)) {
-        PyErr_Format(PicklingError, "Fifth element of tuple"
+        PyErr_Format(PicklingError, "fifth element of the tuple "
                      "returned by __reduce__ must be an iterator, not %s",
                      Py_TYPE(dictitems)->tp_name);
         return -1;

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