From: Alexander Belopolsky <alexander.belopolsky@gmail.com>
Date: Sun, 4 Jul 2010 16:33:25 +0000 (+0000)
Subject: Merged revisions 82533 via svnmerge from
X-Git-Tag: v3.1.3rc1~556
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=775695ad0354aea8248a0d237c38f63649639e1a;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 82533 via svnmerge from
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
........
---

diff --git a/Modules/datetimemodule.c b/Modules/datetimemodule.c
index 419eb7b6d58b..68d13d4d4568 100644
--- a/Modules/datetimemodule.c
+++ b/Modules/datetimemodule.c
@@ -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;
 }