From: Mark Dickinson <dickinsm@gmail.com>
Date: Tue, 7 Jul 2009 10:21:58 +0000 (+0000)
Subject: Merged revisions 73882 via svnmerge from
X-Git-Tag: v3.1.1rc1~98
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a62c94bcf7121d6f2f19968b8102a531ea43f319;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 73882 via svnmerge from
svn+ssh://pythondev@www.python.org/python/branches/py3k

................
  r73882 | mark.dickinson | 2009-07-07 11:21:03 +0100 (Tue, 07 Jul 2009) | 9 lines

  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
  ........
................
---

diff --git a/Modules/_struct.c b/Modules/_struct.c
index 27d596c09a21..3e0ab31a3d44 100644
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -493,7 +493,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;