]> granicus.if.org Git - python/commitdiff
Merged revisions 82533 via svnmerge from
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>
Sun, 4 Jul 2010 16:33:25 +0000 (16:33 +0000)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>
Sun, 4 Jul 2010 16:33:25 +0000 (16:33 +0000)
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82533 | alexander.belopolsky | 2010-07-04 12:28:08 -0400 (Sun, 04 Jul 2010) | 1 line

  Issue #9152: Removed dead code in datetime module
........

Modules/datetimemodule.c

index 419eb7b6d58b16cfcbb29fd47a7ae9bec3b1ceb8..68d13d4d4568ffd4a392286b471fb6870e8918f0 100644 (file)
@@ -957,11 +957,6 @@ call_tzname(PyObject *tzinfo, PyObject *tzinfoarg)
             Py_DECREF(result);
             result = NULL;
         }
-        else if (!PyUnicode_Check(result)) {
-            PyObject *temp = PyUnicode_FromObject(result);
-            Py_DECREF(result);
-            result = temp;
-        }
     }
     return result;
 }