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 /Python | |
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 'Python')
-rw-r--r-- | Python/ast.c | 2 | ||||
-rw-r--r-- | Python/dynload_aix.c | 3 | ||||
-rw-r--r-- | Python/getargs.c | 6 | ||||
-rw-r--r-- | Python/mystrtoul.c | 6 |
4 files changed, 8 insertions, 9 deletions
diff --git a/Python/ast.c b/Python/ast.c index d2f063b..e395c5a 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -3305,7 +3305,7 @@ parsestr(struct compiling *c, const node *n, int *bytesmode) int quote = Py_CHARMASK(*s); int rawmode = 0; int need_encoding; - if (isalpha(quote)) { + if (Py_ISALPHA(quote)) { if (quote == 'b' || quote == 'B') { quote = *++s; *bytesmode = 1; diff --git a/Python/dynload_aix.c b/Python/dynload_aix.c index 149990d..b025cd3 100644 --- a/Python/dynload_aix.c +++ b/Python/dynload_aix.c @@ -4,7 +4,6 @@ #include "Python.h" #include "importdl.h" -#include <ctype.h> /* for isdigit() */ #include <errno.h> /* for global errno */ #include <string.h> /* for strerror() */ #include <stdlib.h> /* for malloc(), free() */ @@ -144,7 +143,7 @@ aix_loaderror(const char *pathname) if (nerr == load_errtab[j].errNo && load_errtab[j].errstr) ERRBUF_APPEND(load_errtab[j].errstr); } - while (isdigit(Py_CHARMASK(*message[i]))) message[i]++ ; + while (Py_ISDIGIT(Py_CHARMASK(*message[i]))) message[i]++ ; ERRBUF_APPEND(message[i]); ERRBUF_APPEND("\n"); } diff --git a/Python/getargs.c b/Python/getargs.c index a77bb05..d588102 100644 --- a/Python/getargs.c +++ b/Python/getargs.c @@ -288,7 +288,7 @@ vgetargs1(PyObject *args, const char *format, va_list *p_va, int flags) if (level == 0) { if (c == 'O') max++; - else if (isalpha(Py_CHARMASK(c))) { + else if (Py_ISALPHA(Py_CHARMASK(c))) { if (c != 'e') /* skip encoded */ max++; } else if (c == '|') @@ -378,7 +378,7 @@ vgetargs1(PyObject *args, const char *format, va_list *p_va, int flags) } } - if (*format != '\0' && !isalpha(Py_CHARMASK(*format)) && + if (*format != '\0' && !Py_ISALPHA(Py_CHARMASK(*format)) && *format != '(' && *format != '|' && *format != ':' && *format != ';') { PyErr_Format(PyExc_SystemError, @@ -471,7 +471,7 @@ converttuple(PyObject *arg, const char **p_format, va_list *p_va, int flags, } else if (c == ':' || c == ';' || c == '\0') break; - else if (level == 0 && isalpha(Py_CHARMASK(c))) + else if (level == 0 && Py_ISALPHA(Py_CHARMASK(c))) n++; } diff --git a/Python/mystrtoul.c b/Python/mystrtoul.c index 52502cb..8a54cbf 100644 --- a/Python/mystrtoul.c +++ b/Python/mystrtoul.c @@ -99,7 +99,7 @@ PyOS_strtoul(register char *str, char **ptr, int base) register int ovlimit; /* required digits to overflow */ /* skip leading white space */ - while (*str && isspace(Py_CHARMASK(*str))) + while (*str && Py_ISSPACE(Py_CHARMASK(*str))) ++str; /* check for leading 0b, 0o or 0x for auto-base or base 16 */ @@ -138,7 +138,7 @@ PyOS_strtoul(register char *str, char **ptr, int base) /* skip all zeroes... */ while (*str == '0') ++str; - while (isspace(Py_CHARMASK(*str))) + while (Py_ISSPACE(Py_CHARMASK(*str))) ++str; if (ptr) *ptr = str; @@ -266,7 +266,7 @@ PyOS_strtol(char *str, char **ptr, int base) unsigned long uresult; char sign; - while (*str && isspace(Py_CHARMASK(*str))) + while (*str && Py_ISSPACE(Py_CHARMASK(*str))) str++; sign = *str; |