Changeset 8380 for main

Timestamp:

7 May 2012, 10:15:21 (12 years ago)

Author:

uli

Message:

Add hash by default when exporting dates.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/utils

Files:

• batching.py (modified) (2 diffs)
• tests/test_batching.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/utils/batching.py

@@ -23 +23 @@
 import grok
 import csv
+import datetime
 import os
 import tempfile
@@ -405 +406 @@
             # CSV writers like byte streams better than unicode
             value = value.encode('utf-8')
+        elif isinstance(value, datetime.datetime):
+            value = str(value)
+        elif isinstance(value, datetime.date):
+            # Order is important here: check for date after datetime as
+            # datetimes are also dates.
+            #
+            # Append hash '#' to dates to circumvent unwanted excel automatic
+            value = str('%s#' % value)
         elif value is None:
             # None is not really representable in CSV files

main/waeup.kofa/trunk/src/waeup/kofa/utils/tests/test_batching.py

@@ -16 +16 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
+import datetime
 import doctest
 import logging
@@ -268 +269 @@
         result4 = exporter.mangle_value(u'string', 'foo')
         result5 = exporter.mangle_value(None, 'foo')
+        result6 = exporter.mangle_value(datetime.date(2012, 4, 1), 'foo')
+        result7 = exporter.mangle_value(
+            datetime.datetime(2012, 4, 1, 12, 1, 1), 'foo')
         self.assertEqual(
             (result1, result2, result3, result4, result5),
@@ -273 +277 @@
         self.assertEqual(type(result3), type('string'))
         self.assertEqual(type(result4), type('string'))
+        # dates are formatted with trailing hash
+        self.assertEqual(result6, '2012-04-01#')
+        # datetimes are formatted as yyyy-mm-dd hh:mm:ss
+        self.assertEqual(result7, '2012-04-01 12:01:01')
         return