From fa414e5874cb6e286eba70efdcb0d3168639ca88 Mon Sep 17 00:00:00 2001
From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Date: Thu, 29 Nov 2012 19:11:21 +0200
Subject: [PATCH] gitmodifier: make the datetime object always have timezone

To be consistent with the date property and for easier compatibility
with git dates.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---
 gbp/git/modifier.py       | 33 +++++++++++++++++++++++++--------
 tests/test_GitModifier.py |  8 ++++----
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/gbp/git/modifier.py b/gbp/git/modifier.py
index a851f47..bc98649 100644
--- a/gbp/git/modifier.py
+++ b/gbp/git/modifier.py
@@ -28,6 +28,17 @@ class GitModifierError(GitError):
     """Exception thrown by L{GitModifier}"""
     pass
 
+class GitTz(datetime.tzinfo):
+    """Simple class to store the utc offset only"""
+    def __init__(self, offset_sec=0, *args, **kwargs):
+        super(GitTz, self).__init__(*args, **kwargs)
+        self._offset = datetime.timedelta(seconds=offset_sec)
+
+    def utcoffset(self, dt):
+        return self._offset
+
+    def dst(self, dt):
+        return datetime.timedelta(0)
 
 class GitModifier(object):
     """Stores authorship/comitter information"""
@@ -45,17 +56,22 @@ class GitModifier(object):
         self._parse_date(date)
 
     def _parse_date(self, date):
-        self._offset = '+0000'
         self._date = None
+        tz = GitTz(0)
 
         if isinstance(date, basestring):
             timestamp, offset = date.split()
-            self._date = datetime.datetime.utcfromtimestamp(int(timestamp))
-            self._offset = offset
+            offset_h = int(offset[:-2])
+            offset_m = int(offset[-2:])
+            tz = GitTz(offset_h*3600 + offset_m*60)
+            self._date = datetime.datetime.fromtimestamp(int(timestamp), tz)
         elif type(date) in  [ type(0), type(0.0) ]:
-            self._date = datetime.datetime.utcfromtimestamp(date)
+            self._date = datetime.datetime.fromtimestamp(date, tz)
         elif isinstance(date, datetime.datetime):
-            self._date = date
+            if date.tzinfo:
+                self._date = date
+            else:
+                self._date = date.replace(tzinfo=tz)
         elif date != None:
             raise ValueError("Date '%s' not timestamp, "
                              "datetime object or git raw date" % date)
@@ -79,7 +95,7 @@ class GitModifier(object):
         """Return date as a git raw date"""
         if self._date:
             return "%s %s" % (calendar.timegm(self._date.utctimetuple()),
-                              self._offset)
+                              self._date.strftime('%z'))
         else:
             return None
 
@@ -97,7 +113,7 @@ class GitModifier(object):
     @property
     def tz_offset(self):
         """Return the date's UTC offset"""
-        return self._offset
+        return self._date.strftime('%z')
 
     def get_author_env(self):
         """
@@ -131,7 +147,8 @@ class GitModifier(object):
         else:
             return self.__dict__[key]
 
-    def keys(self):
+    @staticmethod
+    def keys():
         return [ 'name', 'email', 'date' ]
 
     def items(self):
diff --git a/tests/test_GitModifier.py b/tests/test_GitModifier.py
index eee0e16..1a28c0a 100644
--- a/tests/test_GitModifier.py
+++ b/tests/test_GitModifier.py
@@ -54,13 +54,13 @@ def test_date():
     '1 +0400'
     >>> modifier['date']
     '1 +0400'
-    >>> modifier.datetime
-    datetime.datetime(1970, 1, 1, 0, 0, 1)
+    >>> modifier.datetime   # doctest: +ELLIPSIS
+    datetime.datetime(1970, 1, 1, 4, 0, 1, tzinfo=<gbp.git.modifier.GitTz...>)
     >>> modifier.date = datetime.datetime(1970, 1, 1, 0, 0, 1)
     >>> modifier.date
     '1 +0000'
-    >>> modifier.datetime
-    datetime.datetime(1970, 1, 1, 0, 0, 1)
+    >>> modifier.datetime   # doctest: +ELLIPSIS
+    datetime.datetime(1970, 1, 1, 0, 0, 1, tzinfo=<gbp.git.modifier.GitTz...>)
     >>> modifier.tz_offset
     '+0000'
     """
-- 
2.7.4