diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2013-02-09 22:11:27 (GMT) |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2013-02-09 22:11:27 (GMT) |
commit | 4de7457009d3dac9c93cc5b471d20a8d5e92ff33 (patch) | |
tree | 7dd778385f577557e4fdafb09e55e1b9485f9407 /Modules | |
parent | b6ed17344b456f397df800cc553fef94f5b1e58b (diff) | |
download | cpython-4de7457009d3dac9c93cc5b471d20a8d5e92ff33.zip cpython-4de7457009d3dac9c93cc5b471d20a8d5e92ff33.tar.gz cpython-4de7457009d3dac9c93cc5b471d20a8d5e92ff33.tar.bz2 |
Issue #17173: Remove uses of locale-dependent C functions (isalpha() etc.) in the interpreter.
I've left a couple of them in: zlib (third-party lib), getaddrinfo.c
(doesn't include Python.h, and probably obsolete), _sre.c (legitimate
use for the re.LOCALE flag).
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/_struct.c | 4 | ||||
-rw-r--r-- | Modules/binascii.c | 2 | ||||
-rw-r--r-- | Modules/posixmodule.c | 2 | ||||
-rw-r--r-- | Modules/socketmodule.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Modules/_struct.c b/Modules/_struct.c index edbe9b9..3f20518 100644 --- a/Modules/_struct.c +++ b/Modules/_struct.c @@ -1184,7 +1184,7 @@ prepare_s(PyStructObject *self) size = 0; len = 0; while ((c = *s++) != '\0') { - if (isspace(Py_CHARMASK(c))) + if (Py_ISSPACE(Py_CHARMASK(c))) continue; if ('0' <= c && c <= '9') { num = c - '0'; @@ -1249,7 +1249,7 @@ prepare_s(PyStructObject *self) s = fmt; size = 0; while ((c = *s++) != '\0') { - if (isspace(Py_CHARMASK(c))) + if (Py_ISSPACE(Py_CHARMASK(c))) continue; if ('0' <= c && c <= '9') { num = c - '0'; diff --git a/Modules/binascii.c b/Modules/binascii.c index 19681b4..74db739 100644 --- a/Modules/binascii.c +++ b/Modules/binascii.c @@ -1099,7 +1099,7 @@ This function is also available as \"hexlify()\"."); static int to_int(int c) { - if (isdigit(c)) + if (Py_ISDIGIT(c)) return c - '0'; else { if (Py_ISUPPER(c)) diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 4179c0e..67bff25 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -695,7 +695,7 @@ os2_formatmsg(char *msgbuf, int msglen, char *reason) if (strlen(msgbuf) > 0) { /* If Non-Empty Msg, Trim CRLF */ char *lastc = &msgbuf[ strlen(msgbuf)-1 ]; - while (lastc > msgbuf && isspace(Py_CHARMASK(*lastc))) + while (lastc > msgbuf && Py_ISSPACE(Py_CHARMASK(*lastc))) *lastc-- = '\0'; /* Trim Trailing Whitespace (CRLF) */ } diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index bc3372f..e027625 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -519,7 +519,7 @@ set_error(void) /* If non-empty msg, trim CRLF */ char *lastc = &outbuf[ strlen(outbuf)-1 ]; while (lastc > outbuf && - isspace(Py_CHARMASK(*lastc))) { + Py_ISSPACE(Py_CHARMASK(*lastc))) { /* Trim trailing whitespace (CRLF) */ *lastc-- = '\0'; } |