[Python-checkins] r73883 - in python/branches/release31-maint: Modules/_struct.c

Tue Jul 7 12:21:59 CEST 2009

Author: mark.dickinson
Date: Tue Jul 7 12:21:58 2009
New Revision: 73883
Log:
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 (2009年7月07日) | 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 (2009年7月07日) | 1 line
 
 Typo in error message
 ........
................
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Modules/_struct.c
Modified: python/branches/release31-maint/Modules/_struct.c
==============================================================================

--- python/branches/release31-maint/Modules/_struct.c	(original)
+++ python/branches/release31-maint/Modules/_struct.c	Tue Jul 7 12:21:58 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;
