[SQL-CVS] r4714 - in SQLObject/branches/1.6: docs sqlobject sqlobject/tests

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

Author: phd
Date: Sun May  4 09:15:29 2014
New Revision: 4714

Log:
Remove support for microseconds

Modified:
   SQLObject/branches/1.6/docs/News.txt
   SQLObject/branches/1.6/sqlobject/col.py
   SQLObject/branches/1.6/sqlobject/converters.py
   SQLObject/branches/1.6/sqlobject/tests/test_converters.py
   SQLObject/branches/1.6/sqlobject/tests/test_datetime.py

Modified: SQLObject/branches/1.6/docs/News.txt
==============================================================================
--- SQLObject/branches/1.6/docs/News.txt	Sun Apr 13 06:12:41 2014	(r4713)
+++ SQLObject/branches/1.6/docs/News.txt	Sun May  4 09:15:29 2014	(r4714)
@@ -16,14 +16,6 @@
 * Python 2.4 is no longer supported. The minimal supported version is
   Python 2.5.
 
-* DateTimeCol and TimeCol preserve microseconds. The feature requires
-  Python 2.6+ because in Python 2.5 datetime.strptime doesn't support
-  '%f' format.
-
-  WARNING: backward compatibility problem! Date/Time columns created
-  with microseconds cannot be read back with older versions of
-  SQLObject.
-
 * Upgrade ez_setup to 1.4.2.
 
 * A bugfix was ported from `SQLObject 1.5.2`_.

Modified: SQLObject/branches/1.6/sqlobject/col.py
==============================================================================
--- SQLObject/branches/1.6/sqlobject/col.py	Sun Apr 13 06:12:41 2014	(r4713)
+++ SQLObject/branches/1.6/sqlobject/col.py	Sun May  4 09:15:29 2014	(r4714)
@@ -20,9 +20,7 @@
 
 from array import array
 from itertools import count
-import re
-import sys
-import time
+import re, time
 try:
     import cPickle as pickle
 except ImportError:
@@ -1100,27 +1098,11 @@
                 else:
                     return datetime.time(value.hour, value.minute, int(value.second))
         try:
-            if self.format.find(".%f") >= 0:
-                if '.' in value:
-                    _value = value.split('.')
-                    microseconds = _value[-1]
-                    _l = len(microseconds)
-                    if _l < 6:
-                        _value[-1] = '%06d' % int(microseconds)
-                    elif _l > 6:
-                        _value[-1] = microseconds[:6]
-                    if _l != 6:
-                        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)
+            stime = time.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)
+        return datetime.datetime(*stime[:6])
 
     def from_python(self, value, state):
         if value is None:
@@ -1147,29 +1129,11 @@
             elif isinstance(value, datetime.time):
                 return DateTime.Time(value.hour, value.minute, value.second)
             try:
-                if self.format.find(".%f") >= 0:
-                    if '.' in value:
-                        _value = value.split('.')
-                        microseconds = _value[-1]
-                        _l = len(microseconds)
-                        if _l < 6:
-                            _value[-1] = '%06d' % int(microseconds)
-                        elif _l > 6:
-                            _value[-1] = microseconds[:6]
-                        if _l != 6:
-                            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)
+                stime = time.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)
+            return DateTime.mktime(stime)
 
         def from_python(self, value, state):
             if value is None:
@@ -1182,7 +1146,7 @@
                 (self.name, type(value), value), value, state)
 
 class SODateTimeCol(SOCol):
-    datetimeFormat = '%Y-%m-%d %H:%M:%S.%f'
+    datetimeFormat = '%Y-%m-%d %H:%M:%S'
 
     def __init__(self, **kw):
         datetimeFormat = kw.pop('datetimeFormat', None)
@@ -1313,7 +1277,7 @@
     from_python = to_python
 
 class SOTimeCol(SOCol):
-    timeFormat = '%H:%M:%S.%f'
+    timeFormat = '%H:%M:%S'
 
     def __init__(self, **kw):
         timeFormat = kw.pop('timeFormat', None)

Modified: SQLObject/branches/1.6/sqlobject/converters.py
==============================================================================
--- SQLObject/branches/1.6/sqlobject/converters.py	Sun Apr 13 06:12:41 2014	(r4713)
+++ SQLObject/branches/1.6/sqlobject/converters.py	Sun May  4 09:15:29 2014	(r4714)
@@ -7,11 +7,16 @@
 
 
 try:
+    import mx.DateTime.ISO
+    origISOStr = mx.DateTime.ISO.strGMT
     from mx.DateTime import DateTimeType, DateTimeDeltaType
 except ImportError:
     try:
+        import DateTime.ISO
+        origISOStr = DateTime.ISO.strGMT
         from DateTime import DateTimeType, DateTimeDeltaType
     except ImportError:
+        origISOStr = None
         DateTimeType = None
         DateTimeDeltaType = None
 
@@ -36,6 +41,17 @@
     ('\t', '\\t'),
 ]
 
+def isoStr(val):
+    """
+    Gets rid of time zone information
+    (@@: should we convert to GMT?)
+    """
+    val = origISOStr(val)
+    if val.find('+') == -1:
+        return val
+    else:
+        return val[:val.find('+')]
+
 class ConverterRegistry:
 
     def __init__(self):
@@ -117,12 +133,12 @@
 
 if DateTimeType:
     def DateTimeConverter(value, db):
-        return "'%s'" % value.strftime("%Y-%m-%d %H:%M:%S.%s")
+        return "'%s'" % isoStr(value)
 
     registerConverter(DateTimeType, DateTimeConverter)
 
     def TimeConverter(value, db):
-        return "'%s'" % value.strftime("%H:%M:%S")
+        return "'%s'" % value.strftime("%T")
 
     registerConverter(DateTimeDeltaType, TimeConverter)
 
@@ -151,9 +167,9 @@
     registerConverter(time.struct_time, StructTimeConverter)
 
 def DateTimeConverter(value, db):
-    return "'%04d-%02d-%02d %02d:%02d:%02d.%d'" % (
+    return "'%04d-%02d-%02d %02d:%02d:%02d'" % (
         value.year, value.month, value.day,
-        value.hour, value.minute, value.second, value.microsecond)
+        value.hour, value.minute, value.second)
 
 registerConverter(datetime.datetime, DateTimeConverter)
 
@@ -163,7 +179,7 @@
 registerConverter(datetime.date, DateConverter)
 
 def TimeConverter(value, db):
-    return "'%02d:%02d:%02d.%d'" % (value.hour, value.minute, value.second, value.microsecond)
+    return "'%02d:%02d:%02d'" % (value.hour, value.minute, value.second)
 
 registerConverter(datetime.time, TimeConverter)
 

Modified: SQLObject/branches/1.6/sqlobject/tests/test_converters.py
==============================================================================
--- SQLObject/branches/1.6/sqlobject/tests/test_converters.py	Sun Apr 13 06:12:41 2014	(r4713)
+++ SQLObject/branches/1.6/sqlobject/tests/test_converters.py	Sun May  4 09:15:29 2014	(r4714)
@@ -88,11 +88,11 @@
 
 def test_datetime():
     from datetime import datetime, date, time
-    assert sqlrepr(datetime(2005, 7, 14, 13, 31, 2)) == "'2005-07-14 13:31:02.0'"
+    assert sqlrepr(datetime(2005, 7, 14, 13, 31, 2)) == "'2005-07-14 13:31:02'"
     assert sqlrepr(date(2005, 7, 14)) == "'2005-07-14'"
-    assert sqlrepr(time(13, 31, 2)) == "'13:31:02.0'"
+    assert sqlrepr(time(13, 31, 2)) == "'13:31:02'"
     # now dates before 1900
-    assert sqlrepr(datetime(1428, 7, 14, 13, 31, 2)) == "'1428-07-14 13:31:02.0'"
+    assert sqlrepr(datetime(1428, 7, 14, 13, 31, 2)) == "'1428-07-14 13:31:02'"
     assert sqlrepr(date(1428, 7, 14)) == "'1428-07-14'"
 
 def test_instance():

Modified: SQLObject/branches/1.6/sqlobject/tests/test_datetime.py
==============================================================================
--- SQLObject/branches/1.6/sqlobject/tests/test_datetime.py	Sun Apr 13 06:12:41 2014	(r4713)
+++ SQLObject/branches/1.6/sqlobject/tests/test_datetime.py	Sun May  4 09:15:29 2014	(r4714)
@@ -25,8 +25,7 @@
     assert dt1.col1.day == _now.day
     assert dt1.col1.hour == _now.hour
     assert dt1.col1.minute == _now.minute
-    assert dt1.col1.second == _now.second
-    assert dt1.col1.microsecond == _now.microsecond
+    assert dt1.col1.second == int(_now.second)
 
     assert isinstance(dt1.col2, date)
     assert not isinstance(dt1.col2, datetime)
@@ -37,8 +36,7 @@
     assert isinstance(dt1.col3, time)
     assert dt1.col3.hour == _now.hour
     assert dt1.col3.minute == _now.minute
-    assert dt1.col3.second == _now.second
-    assert dt1.col3.microsecond == _now.microsecond
+    assert dt1.col3.second == int(_now.second)
 
 if mxdatetime_available:
     col.default_datetime_implementation = MXDATETIME_IMPLEMENTATION
@@ -49,7 +47,7 @@
     if connection.dbName == "sqlite":
         if connection.using_sqlite2:
             # mxDateTime sends and PySQLite2 returns full date/time for dates
-            dateFormat = "%Y-%m-%d %H:%M:%S.%f"
+            dateFormat = "%Y-%m-%d %H:%M:%S"
 
     class DateTime2(SQLObject):
         col1 = DateTimeCol()
@@ -59,7 +57,7 @@
     def test_mxDateTime():
         setupClass(DateTime2)
         _now = now()
-        dt2 = DateTime2(col1=_now, col2=_now, col3=Time(_now.hour, _now.minute, _now.second))
+        dt2 = DateTime2(col1=_now, col2=_now, col3=Time(_now.hour, _now.minute, int(_now.second)))
 
         assert isinstance(dt2.col1, col.DateTimeType)
         assert dt2.col1.year == _now.year