traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-37752: Delete redundant Py_CHARMASK in normalizestring() (GH-15095)

This commit is contained in:
Jordon Xu 2019-09-11 00:04:08 +08:00 committed by Steve Dower
parent 801f925998
commit 2ec7010206
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/_struct.c
View File

@ -1298,7 +1298,7 @@ prepare_s(PyStructObject *self)
len = 0; len = 0;
ncodes = 0; ncodes = 0;
while ((c = *s++) != '\0') { while ((c = *s++) != '\0') {
if (Py_ISSPACE(Py_CHARMASK(c))) if (Py_ISSPACE(c))
continue; continue;
if ('0' <= c && c <= '9') { if ('0' <= c && c <= '9') {
num = c - '0'; num = c - '0';
@ -1363,7 +1363,7 @@ prepare_s(PyStructObject *self)
s = fmt; s = fmt;
size = 0; size = 0;
while ((c = *s++) != '\0') { while ((c = *s++) != '\0') {
if (Py_ISSPACE(Py_CHARMASK(c))) if (Py_ISSPACE(c))
continue; continue;
if ('0' <= c && c <= '9') { if ('0' <= c && c <= '9') {
num = c - '0'; num = c - '0';

4
Modules/_tkinter.c
View File

@ -671,8 +671,8 @@ Tkapp_New(const char *screenName, const char *className,
} }
strcpy(argv0, className); strcpy(argv0, className);
if (Py_ISUPPER(Py_CHARMASK(argv0[0]))) if (Py_ISUPPER(argv0[0]))
argv0[0] = Py_TOLOWER(Py_CHARMASK(argv0[0])); argv0[0] = Py_TOLOWER(argv0[0]);
Tcl_SetVar(v->interp, "argv0", argv0, TCL_GLOBAL_ONLY); Tcl_SetVar(v->interp, "argv0", argv0, TCL_GLOBAL_ONLY);
PyMem_Free(argv0); PyMem_Free(argv0);

4
Modules/unicodedata.c
View File

@ -987,7 +987,7 @@ _gethash(const char *s, int len, int scale)
unsigned long h = 0; unsigned long h = 0;
unsigned long ix; unsigned long ix;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
h = (h * scale) + (unsigned char) Py_TOUPPER(Py_CHARMASK(s[i])); h = (h * scale) + (unsigned char) Py_TOUPPER(s[i]);
ix = h & 0xff000000; ix = h & 0xff000000;
if (ix) if (ix)
h = (h ^ ((ix>>24) & 0xff)) & 0x00ffffff; h = (h ^ ((ix>>24) & 0xff)) & 0x00ffffff;
@ -1157,7 +1157,7 @@ _cmpname(PyObject *self, int code, const char* name, int namelen)
if (!_getucname(self, code, buffer, NAME_MAXLEN, 1)) if (!_getucname(self, code, buffer, NAME_MAXLEN, 1))
return 0; return 0;
for (i = 0; i < namelen; i++) { for (i = 0; i < namelen; i++) {
if (Py_TOUPPER(Py_CHARMASK(name[i])) != buffer[i]) if (Py_TOUPPER(name[i]) != buffer[i])
return 0; return 0;
} }
return buffer[namelen] == '\0'; return buffer[namelen] == '\0';

4
Objects/longobject.c
View File

@ -2300,7 +2300,7 @@ PyLong_FromString(const char *str, char **pend, int base)
"int() arg 2 must be >= 2 and <= 36"); "int() arg 2 must be >= 2 and <= 36");
return NULL; return NULL;
} }
while (*str != '\0' && Py_ISSPACE(Py_CHARMASK(*str))) { while (*str != '\0' && Py_ISSPACE(*str)) {
str++; str++;
} }
if (*str == '+') { if (*str == '+') {
@ -2609,7 +2609,7 @@ digit beyond the first.
if (sign < 0) { if (sign < 0) {
Py_SIZE(z) = -(Py_SIZE(z)); Py_SIZE(z) = -(Py_SIZE(z));
} }
while (*str && Py_ISSPACE(Py_CHARMASK(*str))) { while (*str && Py_ISSPACE(*str)) {
str++; str++;
} }
if (*str != '\0') { if (*str != '\0') {

2
Python/dynload_aix.c
View File

@ -140,7 +140,7 @@ aix_loaderror(const char *pathname)
if (nerr == load_errtab[j].errNo && load_errtab[j].errstr) if (nerr == load_errtab[j].errNo && load_errtab[j].errstr)
ERRBUF_APPEND(load_errtab[j].errstr); ERRBUF_APPEND(load_errtab[j].errstr);
} }
while (Py_ISDIGIT(Py_CHARMASK(*message[i]))) message[i]++ ; while (Py_ISDIGIT(*message[i])) message[i]++ ;
ERRBUF_APPEND(message[i]); ERRBUF_APPEND(message[i]);
ERRBUF_APPEND("\n"); ERRBUF_APPEND("\n");
} }

6
Python/getargs.c
View File

@ -312,7 +312,7 @@ vgetargs1_impl(PyObject *compat_args, PyObject *const *stack, Py_ssize_t nargs,
break; break;
default: default:
if (level == 0) { if (level == 0) {
if (Py_ISALPHA(Py_CHARMASK(c))) if (Py_ISALPHA(c))
if (c != 'e') /* skip encoded */ if (c != 'e') /* skip encoded */
max++; max++;
} }
@ -397,7 +397,7 @@ vgetargs1_impl(PyObject *compat_args, PyObject *const *stack, Py_ssize_t nargs,
} }
} }
if (*format != '\0' && !Py_ISALPHA(Py_CHARMASK(*format)) && if (*format != '\0' && !Py_ISALPHA(*format) &&
*format != '(' && *format != '(' &&
*format != '|' && *format != ':' && *format != ';') { *format != '|' && *format != ':' && *format != ';') {
PyErr_Format(PyExc_SystemError, PyErr_Format(PyExc_SystemError,
@ -521,7 +521,7 @@ converttuple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
} }
else if (c == ':' || c == ';' || c == '\0') else if (c == ':' || c == ';' || c == '\0')
break; break;
else if (level == 0 && Py_ISALPHA(Py_CHARMASK(c))) else if (level == 0 && Py_ISALPHA(c))
n++; n++;
} }

6
Python/mystrtoul.c
View File

@ -99,7 +99,7 @@ PyOS_strtoul(const char *str, char **ptr, int base)
int ovlimit; /* required digits to overflow */ int ovlimit; /* required digits to overflow */
/* skip leading white space */ /* skip leading white space */
while (*str && Py_ISSPACE(Py_CHARMASK(*str))) while (*str && Py_ISSPACE(*str))
++str; ++str;
/* check for leading 0b, 0o or 0x for auto-base or base 16 */ /* check for leading 0b, 0o or 0x for auto-base or base 16 */
@ -138,7 +138,7 @@ PyOS_strtoul(const char *str, char **ptr, int base)
/* skip all zeroes... */ /* skip all zeroes... */
while (*str == '0') while (*str == '0')
++str; ++str;
while (Py_ISSPACE(Py_CHARMASK(*str))) while (Py_ISSPACE(*str))
++str; ++str;
if (ptr) if (ptr)
*ptr = (char *)str; *ptr = (char *)str;
@ -266,7 +266,7 @@ PyOS_strtol(const char *str, char **ptr, int base)
unsigned long uresult; unsigned long uresult;
char sign; char sign;
while (*str && Py_ISSPACE(Py_CHARMASK(*str))) while (*str && Py_ISSPACE(*str))
str++; str++;
sign = *str; sign = *str;