[Python-checkins] r82536 - in python/branches/release31-maint: Modules/datetimemodule.c

alexander.belopolsky python-checkins at python.org
Sun Jul 4 18:33:25 CEST 2010


Author: alexander.belopolsky
Date: Sun Jul  4 18:33:25 2010
New Revision: 82536

Log:
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
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Modules/datetimemodule.c

Modified: python/branches/release31-maint/Modules/datetimemodule.c
==============================================================================
--- python/branches/release31-maint/Modules/datetimemodule.c	(original)
+++ python/branches/release31-maint/Modules/datetimemodule.c	Sun Jul  4 18:33:25 2010
@@ -957,11 +957,6 @@
             Py_DECREF(result);
             result = NULL;
         }
-        else if (!PyUnicode_Check(result)) {
-            PyObject *temp = PyUnicode_FromObject(result);
-            Py_DECREF(result);
-            result = temp;
-        }
     }
     return result;
 }


More information about the Python-checkins mailing list