From: Mark Dickinson <dickinsm@gmail.com>
Date: Tue, 7 Jul 2009 10:21:03 +0000 (+0000)
Subject: Merged revisions 73880 via svnmerge from
X-Git-Tag: v3.2a1~2868
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d99620d3a03a13ce90c545aa5355b58faf22cb5c;p=python

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 27d596c09a..3e0ab31a3d 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;