[Python-checkins] cpython (merge 3.2 -> default): #13665: merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/0c0ffebfccb0
changeset:   74487:0c0ffebfccb0
parent:      74485:6a6b226961aa
parent:      74486:b4d9243d16c9
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Wed Jan 18 05:43:21 2012 +0200
summary:
  #13665: merge with 3.2.

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


diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c
--- a/Modules/_ctypes/cfield.c
+++ b/Modules/_ctypes/cfield.c
@@ -1365,7 +1365,7 @@
         _RET(value);
     }
     PyErr_Format(PyExc_TypeError,
-                 "string or integer address expected instead of %s instance",
+                 "bytes or integer address expected instead of %s instance",
                  value->ob_type->tp_name);
     return NULL;
 }

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