summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2009-07-07 10:19:18 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2009-07-07 10:19:18 (GMT)
commit7ad3f9218cdc5a188297918a5865485c135f8c72 (patch)
treeb8176cedd8d7a39b00c8fe898f68f077caa5bf34
parenta1a0adb03c7938a70a7731d1d74b9e9df141a8f3 (diff)
downloadcpython-7ad3f9218cdc5a188297918a5865485c135f8c72.zip
cpython-7ad3f9218cdc5a188297918a5865485c135f8c72.tar.gz
cpython-7ad3f9218cdc5a188297918a5865485c135f8c72.tar.bz2
Merged revisions 73880 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r73880 | mark.dickinson | 2009-07-07 11:18:22 +0100 (Tue, 07 Jul 2009) | 1 line Typo in error message ........
-rw-r--r--Modules/_struct.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_struct.c b/Modules/_struct.c
index b8f1525..9c45dbe 100644
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -646,7 +646,7 @@ np_ushort(char *p, PyObject *v, const formatdef *f)
return -1;
if (x < 0 || x > USHRT_MAX){
PyErr_SetString(StructError,
- "short format requires 0 <= number <= " STRINGIFY(USHRT_MAX));
+ "ushort format requires 0 <= number <= " STRINGIFY(USHRT_MAX));
return -1;
}
y = (unsigned short)x;