Changeset 8162

Timestamp:

15 Apr 2012, 14:04:19 (12 years ago)

Author:

uli

Message:

Support timezones in datetimes.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/widgets

Files:

• datetimewidget.py (modified) (3 diffs)
• tests/test_datetimewidget.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/widgets/datetimewidget.py

@@ -20 +20 @@
 """
 from datetime import datetime
+from zope.datetime import parseDatetimetz, DateTimeError
 from zope.formlib.interfaces import ConversionError, IDisplayWidget
 from zope.formlib.textwidgets import (
@@ -78 +79 @@
             context, request, *args, **kw)
 
+    def _toTZValue(self, string):
+        """Try to turn `string` into a timezone-aware datetime.
+
+        If the string provides no TZ info it is interpreted as
+        localtime (server time).
+
+        We do this by first turning the data-part of the string (w/o
+        TZ info) into some regular datetime (w/o TZ set), then
+        transforming the datetime into an unambigous string again
+        (this time with TZ info from initial string) and finally
+        turning the unambigous string into a datetime with TZ info set
+        (using zope.datetime.parseDatetimetz).
+        """
+        # Split date and tz-info. XXX: Very fragile
+        date, tzdata = string[:19], string[19:]
+        # Turn string representation into something non-ambigious
+        # based on local date_format. Make sure we do not confuse
+        # mm/dd/yy with dd/mm/yy.
+        try:
+            value = datetime.strptime(date, self.date_format)
+        except (DateTimeError, ValueError, IndexError), v:
+            # Fallback: use ISO-representation
+            value = datetime.strptime(
+                date, FormattedDatetimeWidget.date_format)
+        # Create a string unambigous for parseDatetimetz and with TZ info.
+        iso_date = value.strftime('%Y-%m-%dT%H:%M:%S')
+        iso_date += tzdata
+        return parseDatetimetz(iso_date)
+
     def _toFieldValue(self, input):
         # In import files we can use the hash symbol at the end of a
@@ -85 +115 @@
         if input == self._missing:
             return self.context.missing_value
-        else:
-            try:
-                value = datetime.strptime(input, self.date_format)
-            except (ValueError, IndexError), v:
-                try:
-                    # Try ISO format as fallback.
-                    # This is needed for instance during imports.
-                    value = datetime.strptime(
-                        input, FormattedDatetimeWidget.date_format)
-                except (ValueError, IndexError), v:
-                    raise ConversionError("Invalid datetime data", v)
+        try:
+            value = self._toTZValue(input)
+        except (DateTimeError, ValueError, IndexError), v:
+            raise ConversionError("Invalid datetime data", v)
         return value
 

main/waeup.kofa/trunk/src/waeup/kofa/widgets/tests/test_datetimewidget.py

@@ -7 +7 @@
 from zope.interface.verify import verifyClass
 
+from zope.datetime import parseDatetimetz
 from zope.formlib.tests.test_browserwidget import (
     SimpleInputWidgetTest, BrowserWidgetTest, )
@@ -57 +58 @@
     def test_getDefaultInputValue(self,
             value=u'2004-03-26 12:10:20',
-            check_value=datetime.datetime(2004, 3, 26, 12, 10, 20)):
+            check_value = parseDatetimetz('2004-03-26 12:10:20 GMT')):
         self._widget.request.form['field.foo'] = u''
         self.assertRaises(WidgetInputError, self._widget.getInputValue)