get_aware_datetime: adjust use of make_aware to include timezone

pootle/apps/pootle_app/management/commands/contributors.py

@@ -19,15 +19,18 @@
 from . import PootleCommand
 
 
-def get_aware_datetime(dt_string):
+def get_aware_datetime(dt_string, tz=None):
     """Return an aware datetime parsed from a datetime or date string.
 
-    Datetime or date string can be any format parsable by dateutil.parser.parse
+    :param dt_string: datetime or date string can be any format parsable by
+        dateutil.parser.parse.
+    :param tz: timezone in which `dt_string` should be
+        considered.
     """
     if not dt_string:
         return None
     try:
-        return make_aware(parse_datetime(dt_string))
+        return make_aware(parse_datetime(dt_string), tz=tz)
     except ValueError:
         raise ArgumentTypeError('The provided datetime/date string is not '
                                 'valid: "%s"' % dt_string)

tests/commands/contributors.py

@@ -12,6 +12,7 @@
 from email.utils import formataddr
 
 import pytest
+import pytz
 
 from django.core.management import call_command
 from django.core.management.base import CommandError
@@ -23,17 +24,21 @@
 
 def test_contributors_get_aware_datetime():
     """Get an aware datetime from a valid string."""
-    iso_datetime = make_aware(parse_datetime("2016-01-24T23:15:22+0000"))
+    iso_datetime = make_aware(parse_datetime("2016-01-24T23:15:22+0000"),
+                              tz=pytz.utc)
 
     # Test ISO 8601 datetime.
-    assert iso_datetime == get_aware_datetime("2016-01-24T23:15:22+0000")
+    assert iso_datetime == get_aware_datetime("2016-01-24T23:15:22+0000",
+                                              tz=pytz.utc)
 
     # Test git-like datetime.
-    assert iso_datetime == get_aware_datetime("2016-01-24 23:15:22 +0000")
+    assert iso_datetime == get_aware_datetime("2016-01-24 23:15:22 +0000",
+                                              tz=pytz.utc)
 
     # Test just an ISO 8601 date.
-    iso_datetime = make_aware(parse_datetime("2016-01-24T00:00:00+0000"))
-    assert iso_datetime == get_aware_datetime("2016-01-24")
+    iso_datetime = make_aware(parse_datetime("2016-01-24T00:00:00+0000"),
+                              tz=pytz.utc)
+    assert iso_datetime == get_aware_datetime("2016-01-24", tz=pytz.utc)
 
     # Test None.
     assert get_aware_datetime(None) is None