diff options
| author | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2010-07-04 16:33:25 (GMT) |
|---|---|---|
| committer | Alexander Belopolsky <alexander.belopolsky@gmail.com> | 2010-07-04 16:33:25 (GMT) |
| commit | 775695ad0354aea8248a0d237c38f63649639e1a (patch) | |
| tree | 1c20eba617bf298641d6605a0c444a01a88fd7d2 /Modules | |
| parent | 874135b9ae86d631fc5d90d6af96529c421d91a4 (diff) | |
| download | cpython-775695ad0354aea8248a0d237c38f63649639e1a.zip cpython-775695ad0354aea8248a0d237c38f63649639e1a.tar.gz cpython-775695ad0354aea8248a0d237c38f63649639e1a.tar.bz2 | |
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
........
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/datetimemodule.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Modules/datetimemodule.c b/Modules/datetimemodule.c index 419eb7b..68d13d4 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; } |