[SQL-CVS] r4740 - in SQLObject/trunk: docs sqlobject

[<sub...@co...>]

Author: phd
Date: Sun May 11 10:46:13 2014
New Revision: 4740

Log:
Merge revision 4739 from branch 1.7: replace time.strptime with datetime.strptime

Modified:
   SQLObject/trunk/docs/TODO.txt
   SQLObject/trunk/sqlobject/col.py

Modified: SQLObject/trunk/docs/TODO.txt
==============================================================================
--- SQLObject/trunk/docs/TODO.txt	Sun May 11 10:45:09 2014	(r4739)
+++ SQLObject/trunk/docs/TODO.txt	Sun May 11 10:46:13 2014	(r4740)
@@ -47,7 +47,7 @@
 
 * Stop supporting Python 2.5:
   make ConnectionHub a context manager instead of .doInTransaction();
-  replace time.strptime with datetime.strptime. Upgrade ez_setup to 2.0+.
+  Upgrade ez_setup to 2.0+.
 
 * Create JSONCol.
 

Modified: SQLObject/trunk/sqlobject/col.py
==============================================================================
--- SQLObject/trunk/sqlobject/col.py	Sun May 11 10:45:09 2014	(r4739)
+++ SQLObject/trunk/sqlobject/col.py	Sun May 11 10:46:13 2014	(r4740)
@@ -1113,11 +1113,7 @@
                         value = '.'.join(_value)
                 else:
                     value += '.0'
-            if sys.version_info[:3] < (2, 6, 0): # datetime.strptime in python2.5 doesn't support '%f' format
-                stime = time.strptime(value, self.format)
-                return datetime.datetime(*stime[:6])
-            else:
-                return datetime.datetime.strptime(value, self.format)
+            return datetime.datetime.strptime(value, self.format)
         except:
             raise validators.Invalid("expected a date/time string of the '%s' format in the DateTimeCol '%s', got %s %r instead" % \
                 (self.format, self.name, type(value), value), value, state)
@@ -1160,13 +1156,9 @@
                             value = '.'.join(_value)
                     else:
                         value += '.0'
-                if sys.version_info[:3] < (2, 6, 0): # datetime.strptime in python2.5 doesn't support '%f' format
-                    stime = time.strptime(value, self.format)
-                    return DateTime.mktime(stime)
-                else:
-                    value = datetime.datetime.strptime(value, self.format)
-                    return DateTime.DateTime(value.year, value.month, value.day,
-                        value.hour, value.minute, value.second)
+                value = datetime.datetime.strptime(value, self.format)
+                return DateTime.DateTime(value.year, value.month, value.day,
+                    value.hour, value.minute, value.second)
             except:
                 raise validators.Invalid("expected a date/time string of the '%s' format in the DateTimeCol '%s', got %s %r instead" % \
                     (self.format, self.name, type(value), value), value, state)