Merge pull request #49 from AusDTO/bugfix/user-dates

Bugfix/user dates
AusDTO · Oct 16, 2016 · d216c69 · d216c69
2 parents 9969151 + e91afb9
commit d216c69
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dmutils/user.py b/dmutils/user.py
@@ -83,8 +83,8 @@ def from_json(user_json):
         user = user_json["users"]
         supplier_code = None
         supplier_name = None
-        terms_accepted_at = pendulum.parse(user['termsAcceptedAt'])
-        terms_accepted_at = terms_accepted_at.replace(tzinfo=pytz.timezone('UTC'))
+        terms_accepted_at = pendulum.parse(user['termsAcceptedAt']).in_tz('UTC')
+
         if "supplier" in user:
             supplier_code = user["supplier"]["supplierCode"]
             supplier_name = user["supplier"]["name"]

diff --git a/tests/test_user.py b/tests/test_user.py
@@ -24,7 +24,7 @@ def user_json():
                 "supplierCode": 321,
                 "name": "test supplier",
             },
-            "termsAcceptedAt": "2016-01-01T01:00:00.0Z",
+            "termsAcceptedAt": "2016-01-01T01:00:00.0+00:00",
         }
     }