Apparently introduced by a wholesale elimination of PyString_ in r57374, the else clause in the following snippet from call_tzname is redundant:



        if (!PyUnicode_Check(result)) {
            PyErr_Format(PyExc_TypeError, "tzinfo.tzname() must "
                         "return None or a string, not '%s'",
                         Py_TYPE(result)->tp_name);
            Py_DECREF(result);
            result = NULL;
        }
        else if (!PyUnicode_Check(result)) {
            PyObject *temp = PyUnicode_FromObject(result);
            Py_DECREF(result);
            result = temp;
        }

Committed in r82533.

Merged in 3.1 in r82536.