BF: adjust mktime output for the local offset (Close gitpython-developers#218)

Author: yarikoptic

git/objects/util.py

@@ -156,7 +156,10 @@ def parse_date(string_date):
                     fstruct = time.struct_time((dtstruct.tm_year, dtstruct.tm_mon, dtstruct.tm_mday,
                                                 tstruct.tm_hour, tstruct.tm_min, tstruct.tm_sec,
                                                 dtstruct.tm_wday, dtstruct.tm_yday, tstruct.tm_isdst))
-                    return int(time.mktime(fstruct)), utctz_to_altz(offset)
+                    utctime = time.mktime(fstruct)
+                    # time.mktime returns local time, so we need to adjust it for local offset
+                    utctime -= time.altzone if time.daylight else time.timezone
+                    return int(utctime), utctz_to_altz(offset)
                 except ValueError:
                     continue
                 # END exception handling

git/test/test_util.py

@@ -102,7 +102,7 @@ def assert_rval(rval, veri_time, offset=0):
         iso3 = ("2005.04.07 22:13:11 -0000", 0)
         alt = ("04/07/2005 22:13:11", 0)
         alt2 = ("07.04.2005 22:13:11", 0)
-        veri_time = 1112904791      # the time this represents
+        veri_time = 1112911991      # the time this represents
         for date, offset in (rfc, iso, iso2, iso3, alt, alt2):
             assert_rval(parse_date(date), veri_time, offset)
         # END for each date type