mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Issue #17173: Remove uses of locale-dependent C functions (isalpha() etc.) in the interpreter.

Browse source 
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).
This commit is contained in:
Antoine Pitrou 2013-02-09 23:11:27 +01:00
parent b6ed17344b
commit 4de7457009
11 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Python/ast.c
View file

@ -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;

3
Python/dynload_aix.c
View file

@ -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");
}

6
Python/getargs.c
View file

@ -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++;
}

6
Python/mystrtoul.c
View file

@ -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;