mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-19 09:15:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

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)
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("\n");
}

6
Python/getargs.c
View file

@ -312,7 +312,7 @@ vgetargs1_impl(PyObject *compat_args, PyObject *const *stack, Py_ssize_t nargs,
break;
default:
if (level == 0) {
if (Py_ISALPHA(Py_CHARMASK(c)))
if (Py_ISALPHA(c))
if (c != 'e') /* skip encoded */
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 != ';') {
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')
break;
else if (level == 0 && Py_ISALPHA(Py_CHARMASK(c)))
else if (level == 0 && Py_ISALPHA(c))
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 */
/* skip leading white space */
while (*str && Py_ISSPACE(Py_CHARMASK(*str)))
while (*str && Py_ISSPACE(*str))
++str;
/* 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... */
while (*str == '0')
++str;
while (Py_ISSPACE(Py_CHARMASK(*str)))
while (Py_ISSPACE(*str))
++str;
if (ptr)
*ptr = (char *)str;
@ -266,7 +266,7 @@ PyOS_strtol(const char *str, char **ptr, int base)
unsigned long uresult;
char sign;
while (*str && Py_ISSPACE(Py_CHARMASK(*str)))
while (*str && Py_ISSPACE(*str))
str++;
sign = *str;