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

[alexandre.vassalotti]

http://hg.python.org/cpython/rev/a295decb8ed7
changeset:   83340:a295decb8ed7
branch:      3.3
parent:      83337:4f6efe93b77f
parent:      83339:aa6f41599ef2
user:        Alexandre Vassalotti <alexandre at peadrop.com>
date:        Sun Apr 14 02:10:14 2013 -0700
summary:
  Merge heads.

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
@@ -2958,7 +2958,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;
@@ -2967,7 +2967,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