commit a62c94bcf7121d6f2f19968b8102a531ea43f319
author Mark Dickinson <dickinsm@gmail.com> Tue Jul 07 10:21:58 2009 +0000
committer Mark Dickinson <dickinsm@gmail.com> Tue Jul 07 10:21:58 2009 +0000
tree 3a10b40ce1051305bb94ff6ab7b6fef6aae72a43
parent 5f587b41669885f94fe71b4cba83701d8d81bd2d

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

Modules/_struct.c

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