util: If no date or datetime, assume 1970. Update tests to reflect this.

wok/tests/test_util.py

@@ -80,11 +80,12 @@ def test_just_date(self):
         self.assertEquals(inp, out)
 
     def test_just_time(self):
-        inp = {'time': self.time}
+        t = self.time # otherwise the datetime line gets awful
+        inp = {'time': t}
         out = {
-            'datetime': datetime(1970, 1, 1),
+            'datetime': datetime(1970, 1, 1, t.hour, t.minute, t.second),
             'date': date(1970, 1, 1),
-            'time': self.time,
+            'time': t,
         }
 
         util.date_and_times(inp)

wok/util.py

@@ -57,14 +57,16 @@ def date_and_times(meta):
 
         time_part = time(hours, minutes, seconds)
 
+    if date_part is None:
+        date_part = date(1970, 1, 1)
+
     meta['date'] = date_part
+
     meta['time'] = time_part
 
     if date_part is not None and time_part is not None:
         meta['datetime'] = datetime(date_part.year, date_part.month,
                 date_part.day, time_part.hour, time_part.minute,
                 time_part.second, time_part.microsecond, time_part.tzinfo)
-    elif date_part is not None:
-        meta['datetime'] = datetime(date_part.year, date_part.month, date_part.day)
     else:
-        meta['datetime'] = None
+        meta['datetime'] = datetime(date_part.year, date_part.month, date_part.day)