diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2013-02-09 22:14:42 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2013-02-09 22:14:42 (GMT) |
| commit | c73c561181c3ea3bf15c908a827878e1450a5ac6 (patch) | |
| tree | f924a60b5c1b5aa172cf3eba2c39605789a7017c /Python/getargs.c | |
| parent | 859cd4723f07e2b1da7387f5be0f2ce0a195974d (diff) | |
| parent | 4de7457009d3dac9c93cc5b471d20a8d5e92ff33 (diff) | |
| download | cpython-c73c561181c3ea3bf15c908a827878e1450a5ac6.zip cpython-c73c561181c3ea3bf15c908a827878e1450a5ac6.tar.gz cpython-c73c561181c3ea3bf15c908a827878e1450a5ac6.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), mpdecimal (needs to build without Python.h).
Diffstat (limited to 'Python/getargs.c')
| -rw-r--r-- | Python/getargs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Python/getargs.c b/Python/getargs.c index 18c8e91..ae931b9 100644 --- a/Python/getargs.c +++ b/Python/getargs.c @@ -244,7 +244,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 == '|') @@ -336,7 +336,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, @@ -429,7 +429,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++; } |