diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-10-04 11:55:37 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-10-04 11:55:37 (GMT) |
| commit | 44b3b5457a8af636504940f508b2888f6e080ca7 (patch) | |
| tree | dbb135c9572e914afbf996dde8f5aa4e15bdd593 | |
| parent | ace2ccf387fbe751e09fdb4bd507a3702b637d8a (diff) | |
| download | cpython-44b3b5457a8af636504940f508b2888f6e080ca7.zip cpython-44b3b5457a8af636504940f508b2888f6e080ca7.tar.gz cpython-44b3b5457a8af636504940f508b2888f6e080ca7.tar.bz2 | |
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)
| -rw-r--r-- | Modules/_tkinter.c | 4 | ||||
| -rw-r--r-- | Modules/binascii.c | 4 | ||||
| -rw-r--r-- | Modules/unicodedata.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index 01d6284..40c8be2 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -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); diff --git a/Modules/binascii.c b/Modules/binascii.c index 2d91b7f..8334fe5 100644 --- a/Modules/binascii.c +++ b/Modules/binascii.c @@ -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; } diff --git a/Modules/unicodedata.c b/Modules/unicodedata.c index e39a4d6..1445a95 100644 --- a/Modules/unicodedata.c +++ b/Modules/unicodedata.c @@ -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'; |