Merge pull request tobami#279 from Kami/support_tz_aware_datetime_objects

tobami · web-flow · commit e89a614b1475 · 2020-02-18T10:22:46.000+01:00
Support timezone aware datetime objects with Github provider
diff --git a/codespeed/commits/github.py b/codespeed/commits/github.py
@@ -20,8 +20,8 @@
 import json
 
 import isodate
-from django.conf import settings
 from django.core.cache import cache
+from django.conf import settings
 
 from .exceptions import CommitLogError
 
@@ -103,11 +103,13 @@ def retrieve_revision(commit_id, username, project, revision=None):
     if revision:
         # Overwrite any existing data we might have for this revision since
         # we never want our records to be out of sync with the actual VCS:
-
-        # We need to convert the timezone-aware date to a naive (i.e.
-        # timezone-less) date in UTC to avoid killing MySQL:
-        revision.date = date.astimezone(
-            isodate.tzinfo.Utc()).replace(tzinfo=None)
+        if not getattr(settings, 'USE_TZ_AWARE_DATES', False):
+            # We need to convert the timezone-aware date to a naive (i.e.
+            # timezone-less) date in UTC to avoid killing MySQL:
+            logger.debug('USE_TZ_AWARE_DATES setting is set to False, '
+                         'converting datetime object to a naive one')
+            revision.date = date.astimezone(
+                isodate.tzinfo.Utc()).replace(tzinfo=None)
         revision.author = commit_json['author']['name']
         revision.message = commit_json['message']
         revision.full_clean()
diff --git a/codespeed/settings.py b/codespeed/settings.py
@@ -84,6 +84,9 @@
 ALLOW_ANONYMOUS_POST = True  # Whether anonymous users can post results
 REQUIRE_SECURE_AUTH = True  # Whether auth needs to be over a secure channel
 
+US_TZ_AWARE_DATES = False  # True to use timezone aware datetime objects with Github provider.
+                           # NOTE: Some database backends may not support tz aware dates.
+
 GITHUB_OAUTH_TOKEN = None  # Github oAuth token to use when using Github repo type. If not
                            # specified, it will utilize unauthenticated requests which have
                            # low rate limits.
