[2383] Adding descriptive message to ValueError

And added test that explicitely tests the second form of UTC offset.
ckan · May 28, 2012 · 70e58d4 · 70e58d4
1 parent d6c9e48
commit 70e58d4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
@@ -616,7 +616,8 @@ def date_str_to_datetime(date_str):
         m = re.match('(?P<seconds>\d{2})(\.(?P<microseconds>\d{6}))?$',
                      time_tuple[5])
         if not m:
-            raise ValueError
+            raise ValueError('Unable to parse %s as seconds.microseconds' %
+                             time_tuple[5])
         seconds = int(m.groupdict().get('seconds'))
         microseconds = int(m.groupdict(0).get('microseconds'))
         time_tuple = time_tuple[:5] + [seconds, microseconds]

diff --git a/ckan/tests/lib/test_helpers.py b/ckan/tests/lib/test_helpers.py
@@ -56,6 +56,11 @@ def test_date_str_to_datetime_with_timezone(self):
                       h.date_str_to_datetime,
                       '2008-04-13T20:40:20-01:30')
 
+    def test_date_str_to_datetime_with_timezone_without_colon(self):
+        assert_raises(ValueError,
+                      h.date_str_to_datetime,
+                      '2008-04-13T20:40:20-0130')
+
     def test_date_str_to_datetime_with_garbage_on_end(self):
         assert_raises(ValueError,
                       h.date_str_to_datetime,