closes bpo-39684: Combine two if/thens and squash uninit var warning. (GH-18565)

This commit is contained in:
Andy Lester 2020-02-20 22:51:47 -06:00 committed by GitHub
parent 90930e6545
commit 933fc53f3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 8 deletions

View File

@ -12209,20 +12209,15 @@ PyUnicode_IsIdentifier(PyObject *self)
int kind = 0;
void *data = NULL;
wchar_t *wstr;
const wchar_t *wstr = NULL;
Py_UCS4 ch;
if (ready) {
kind = PyUnicode_KIND(self);
data = PyUnicode_DATA(self);
}
else {
wstr = _PyUnicode_WSTR(self);
}
Py_UCS4 ch;
if (ready) {
ch = PyUnicode_READ(kind, data, 0);
}
else {
wstr = _PyUnicode_WSTR(self);
ch = wstr[0];
}
/* PEP 3131 says that the first character must be in