Merge pull request ckan#9 from qld-gov-au/datetimeFix

Use utc timezone so storage and helper functions work correctly

ckanext/qa/bin/migrate_task_status.py

@@ -19,7 +19,7 @@
 
 START_OF_TIME = datetime.datetime(1980, 1, 1)
 END_OF_TIME = datetime.datetime(9999, 12, 31)
-TODAY = datetime.datetime.now()
+TODAY = datetime.datetime.utcnow()
 
 # NB put no CKAN imports here, or logging breaks
 

ckanext/qa/bin/running_stats.py

@@ -35,14 +35,13 @@
 import copy
 import datetime
 
-
 class StatsCount(dict):
     # {category:count}
     _init_value = 0
     report_value_limit = 150
 
     def __init__(self, *args, **kwargs):
-        self._start_time = datetime.datetime.now()
+        self._start_time = datetime.datetime.utcnow()
         super(StatsCount, self).__init__(*args, **kwargs)
 
     def _init_category(self, category):
@@ -80,7 +79,7 @@ def report(self, indent=1, order_by_title=False, show_time_taken=True):
             lines = [indent_str + 'None']
 
         if show_time_taken:
-            time_taken = datetime.datetime.now() - self._start_time
+            time_taken = datetime.datetime.utcnow() - self._start_time
             lines.append(indent_str + 'Time taken (h:m:s): %s' % time_taken)
         return '\n'.join(lines)
 

ckanext/qa/model.py

@@ -35,8 +35,8 @@ class QA(Base):
     openness_score_reason = Column(types.UnicodeText)
     format = Column(types.UnicodeText)
 
-    created = Column(types.DateTime, default=datetime.datetime.now)
-    updated = Column(types.DateTime, default=datetime.datetime.now)
+    created = Column(types.DateTime, default=datetime.datetime.utcnow)
+    updated = Column(types.DateTime, default=datetime.datetime.utcnow)
 
     def __repr__(self):
         summary = 'score=%s format=%s' % (self.openness_score, self.format)

ckanext/qa/tasks.py

@@ -9,6 +9,7 @@
 import tempfile
 import time
 import traceback
+
 import urlparse
 import routes
 
@@ -610,7 +611,7 @@ def save_qa_result(resource, qa_result):
     import ckan.model as model
     from ckanext.qa.model import QA
 
-    now = datetime.datetime.now()
+    now = datetime.datetime.utcnow()
 
     qa = QA.get_for_resource(resource.id)
     if not qa: