https://github.com/python/cpython/commit/933fc53f3f9c64ffa703b1f23a93bec560f... commit: 933fc53f3f9c64ffa703b1f23a93bec560faea57 branch: master author: Andy Lester <andy@petdance.com> committer: GitHub <noreply@github.com> date: 2020-02-20T20:51:47-08:00 summary: closes bpo-39684: Combine two if/thens and squash uninit var warning. (GH-18565) files: M Objects/unicodeobject.c diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 4475eca9432db..ee6d3dfd3945b 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -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