Merge pull request #1547 from jcowgill/non-hour-timezones

Fix timezone parsing functions for non-hour timezones

Author: Byron

git/objects/util.py

@@ -137,22 +137,25 @@ def get_object_type_by_name(
 
 
 defutctz_to_altz(utctz: str) ->int:
-"""we convert utctz to the timezone in seconds, it is the format time.altzone
- returns. Git stores it as UTC timezone which has the opposite sign as well,
- which explains the -1 * ( that was made explicit here )
-
- :param utctz: git utc timezone string, i.e. +0200"""
-return-1*int(float(utctz) /100*3600)
-
-
-defaltz_to_utctz_str(altz: float) ->str:
-"""As above, but inverses the operation, returning a string that can be used
- in commit objects"""
-utci=-1*int((float(altz) /3600) *100)
-utcs=str(abs(utci))
-utcs="0"* (4-len(utcs)) +utcs
-prefix= (utci<0and"-") or"+"
-returnprefix+utcs
+"""Convert a git timezone offset into a timezone offset west of
+ UTC in seconds (compatible with time.altzone).
+
+ :param utctz: git utc timezone string, i.e. +0200
+ """
+int_utctz=int(utctz)
+seconds= ((abs(int_utctz) //100) *3600+ (abs(int_utctz) %100) *60)
+returnsecondsifint_utctz<0else-seconds
+
+
+defaltz_to_utctz_str(altz: int) ->str:
+"""Convert a timezone offset west of UTC in seconds into a git timezone offset string
+
+ :param altz: timezone offset in seconds west of UTC
+ """
+hours=abs(altz) //3600
+minutes= (abs(altz) %3600) //60
+sign="-"ifaltz>=60else"+"
+return"{}{:02}{:02}".format(sign, hours, minutes)
 
 
 defverify_utctz(offset: str) ->str:

test/test_util.py

@@ -333,6 +333,27 @@ def test_iterable_list(self, case):
 self.assertRaises(IndexError, ilist.__delitem__, 0)
 self.assertRaises(IndexError, ilist.__delitem__, "something")
 
+deftest_utctz_to_altz(self):
+self.assertEqual(utctz_to_altz("+0000"), 0)
+self.assertEqual(utctz_to_altz("+1400"), -(14*3600))
+self.assertEqual(utctz_to_altz("-1200"), 12*3600)
+self.assertEqual(utctz_to_altz("+0001"), -60)
+self.assertEqual(utctz_to_altz("+0530"), -(5*3600+1800))
+self.assertEqual(utctz_to_altz("-0930"), 9*3600+1800)
+
+deftest_altz_to_utctz_str(self):
+self.assertEqual(altz_to_utctz_str(0), "+0000")
+self.assertEqual(altz_to_utctz_str(-(14*3600)), "+1400")
+self.assertEqual(altz_to_utctz_str(12*3600), "-1200")
+self.assertEqual(altz_to_utctz_str(-60), "+0001")
+self.assertEqual(altz_to_utctz_str(-(5*3600+1800)), "+0530")
+self.assertEqual(altz_to_utctz_str(9*3600+1800), "-0930")
+
+self.assertEqual(altz_to_utctz_str(1), "+0000")
+self.assertEqual(altz_to_utctz_str(59), "+0000")
+self.assertEqual(altz_to_utctz_str(-1), "+0000")
+self.assertEqual(altz_to_utctz_str(-59), "+0000")
+
 deftest_from_timestamp(self):
 # Correct offset: UTC+2, should return datetime + tzoffset(+2)
 altz=utctz_to_altz("+0200")