traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove all other uses of the C tolower()/toupper() which could break with a Turkish locale. 

(except in the strop module, which is deprecated anyway)
This commit is contained in:
Antoine Pitrou 2011-10-04 13:55:37 +02:00
parent ace2ccf387
commit 44b3b5457a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/_tkinter.c
View File

@ -663,8 +663,8 @@ Tkapp_New(char *screenName, char *baseName, char *className,
}
strcpy(argv0, className);
if (isupper(Py_CHARMASK(argv0[0])))
argv0[0] = tolower(Py_CHARMASK(argv0[0]));
if (Py_ISUPPER(Py_CHARMASK(argv0[0])))
argv0[0] = Py_TOLOWER(Py_CHARMASK(argv0[0]));
Tcl_SetVar(v->interp, "argv0", argv0, TCL_GLOBAL_ONLY);
ckfree(argv0);

4
Modules/binascii.c
View File

@ -1105,8 +1105,8 @@ to_int(int c)
if (isdigit(c))
return c - '0';
else {
if (isupper(c))
c = tolower(c);
if (Py_ISUPPER(c))
c = Py_TOLOWER(c);
if (c >= 'a' && c <= 'f')
return c - 'a' + 10;
}

4
Modules/unicodedata.c
View File

@ -830,7 +830,7 @@ _gethash(const char *s, int len, int scale)
unsigned long h = 0;
unsigned long ix;
for (i = 0; i < len; i++) {
h = (h * scale) + (unsigned char) toupper(Py_CHARMASK(s[i]));
h = (h * scale) + (unsigned char) Py_TOUPPER(Py_CHARMASK(s[i]));
ix = h & 0xff000000;
if (ix)
h = (h ^ ((ix>>24) & 0xff)) & 0x00ffffff;
@ -978,7 +978,7 @@ _cmpname(PyObject *self, int code, const char* name, int namelen)
if (!_getucname(self, code, buffer, sizeof(buffer)))
return 0;
for (i = 0; i < namelen; i++) {
if (toupper(Py_CHARMASK(name[i])) != buffer[i])
if (Py_TOUPPER(Py_CHARMASK(name[i])) != buffer[i])
return 0;
}
return buffer[namelen] == '\0';