accept datetime instances as dates

There's no easy way to re-create a commit (i.e. for rewriting purposes), because dates must be formatted as strings, passed, then parsed back.

This patch allows parse_date() to accept datetime instances, such as those produced by from_timestamp() above.

Author: mildsunrise

git/objects/util.py

@@ -135,6 +135,7 @@ def parse_date(string_date):
     """
     Parse the given date as one of the following
 
+        * aware datetime instance
         * Git internal format: timestamp offset
         * RFC 2822: Thu, 07 Apr 2005 22:13:13 +0200.
         * ISO 8601 2005-04-07T22:13:13
@@ -144,6 +145,10 @@ def parse_date(string_date):
     :raise ValueError: If the format could not be understood
     :note: Date can also be YYYY.MM.DD, MM/DD/YYYY and DD.MM.YYYY.
     """
+    if isinstance(string_date, datetime) and string_date.tzinfo:
+        offset = -int(string_date.utcoffset().total_seconds())
+        return int(string_date.timestamp()), offset
+
     # git time
     try:
         if string_date.count(' ') == 1 and string_date.rfind(':') == -1:

test/test_util.py

@@ -8,7 +8,7 @@
 import tempfile
 import time
 from unittest import skipIf
-from datetime import datetime
+from datetime import datetime, timezone, timedelta
 
 import ddt
 
@@ -188,18 +188,22 @@ def assert_rval(rval, veri_time, offset=0):
             self.assertEqual(utctz_to_altz(verify_utctz(utctz)), offset)
         # END assert rval utility
 
+        UTC_PLUS_TWO = timezone(timedelta(seconds=7200))
+        dt = (datetime.fromtimestamp(1112911991, UTC_PLUS_TWO), -7200)
+
         rfc = ("Thu, 07 Apr 2005 22:13:11 +0000", 0)
         iso = ("2005-04-07T22:13:11 -0200", 7200)
         iso2 = ("2005-04-07 22:13:11 +0400", -14400)
         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_utc = 1112911991      # the time this represents, in time since epoch, UTC
-        for date, offset in (rfc, iso, iso2, iso3, alt, alt2):
+        for date, offset in (dt, rfc, iso, iso2, iso3, alt, alt2):
             assert_rval(parse_date(date), veri_time_utc, offset)
         # END for each date type
 
         # and failure
+        self.assertRaises(ValueError, parse_date, datetime.now()) # non-aware datetime
         self.assertRaises(ValueError, parse_date, 'invalid format')
         self.assertRaises(ValueError, parse_date, '123456789 -02000')
         self.assertRaises(ValueError, parse_date, ' 123456789 -0200')