making datetimes to ui timezone aware. closes #24

jucacrispim · Oct 25, 2017 · bcc414d · bcc414d
1 parent b3677a9
commit bcc414d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/tests/unit/core/test_utils.py b/tests/unit/core/test_utils.py
@@ -171,7 +171,12 @@ def test_datetime2string(self):
         dt = utils.now()
         expected = datetime.datetime.strftime(dt, '%a %b %d %H:%M:%S %Y %z')
         returned = utils.datetime2string(dt)
+        self.assertEqual(returned, expected)
 
+    def test_datetime2string_timezone(self):
+        dt = utils.localtime2utc(utils.now())
+        expected = datetime.datetime.strftime(dt, '%a %b %d %H:%M:%S %Y %z')
+        returned = utils.datetime2string(datetime.datetime.now())
         self.assertEqual(returned, expected)
 
     def test_datetime2string_with_other_format(self):

diff --git a/toxicbuild/core/utils.py b/toxicbuild/core/utils.py
@@ -171,6 +171,8 @@ def datetime2string(dt, dtformat='%a %b %d %H:%M:%S %Y %z'):
     :param dt: The datetime object.
     :param dtformat: The format to use."""
 
+    if dt.utcoffset() is None:
+        dt = localtime2utc(dt)
     return datetime.strftime(dt, dtformat)