[Python-checkins] python/dist/src/Objects unicodeobject.c, 2.197, 2.198

Tue Sep 16 16:31:02 EDT 2003

Update of /cvsroot/python/python/dist/src/Objects
In directory sc8-pr-cvs1:/tmp/cvs-serv17421/Objects
Modified Files:
	unicodeobject.c 
Log Message:
On c.l.py, Martin v. Löwis said that Py_UNICODE could be of a signed type,
so fiddle Jeremy's fix to live with that. Also added more comments.
Bugfix candidate (this bug is in all versions of Python, at least since
2.1).
Index: unicodeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v
retrieving revision 2.197
retrieving revision 2.198
diff -C2 -d -r2.197 -r2.198
*** unicodeobject.c	16 Sep 2003 19:41:39 -0000	2.197
--- unicodeobject.c	16 Sep 2003 20:30:58 -0000	2.198
***************
*** 1,3 ****
! /* 
 
 Unicode implementation based on original code by Fredrik Lundh,
--- 1,3 ----
! /*
 
 Unicode implementation based on original code by Fredrik Lundh,
***************
*** 54,58 ****
 The implementation will keep allocated Unicode memory intact for
[...1534 lines suppressed...]
 		}
--- 6333,6337 ----
 		if (dict == NULL) {
 		 PyErr_SetString(PyExc_TypeError,
! 				 "format requires a mapping");
 		 goto onError;
 		}
***************
*** 6571,6575 ****
 			 "unsupported format character '%c' (0x%x) "
 			 "at index %i",
! 			 (31<=c && c<=126) ? (char)c : '?', 
 (int)c,
 			 (int)(fmt -1 - PyUnicode_AS_UNICODE(uformat)));
--- 6579,6583 ----
 			 "unsupported format character '%c' (0x%x) "
 			 "at index %i",
! 			 (31<=c && c<=126) ? (char)c : '?',
 (int)c,
 			 (int)(fmt -1 - PyUnicode_AS_UNICODE(uformat)));