[Python-checkins] r73882 - in python/branches/py3k: Modules/_struct.c

[mark.dickinson]

Author: mark.dickinson
Date: Tue Jul  7 12:21:03 2009
New Revision: 73882

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


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Modules/_struct.c

Modified: python/branches/py3k/Modules/_struct.c
==============================================================================
--- python/branches/py3k/Modules/_struct.c	(original)
+++ python/branches/py3k/Modules/_struct.c	Tue Jul  7 12:21:03 2009
@@ -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;