FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix timezone parsing functions for non-hour timezones by jcowgill · Pull Request #1547 · gitpython-developers/GitPython · GitHub

  1. gitpython-developers
  2. GitPython

Repository navigation

Fix timezone parsing functions for non-hour timezones #1547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Byron merged 1 commit into from
Jan 25, 2023
Conversation 2 Commits 1 Checks 0 Files changed
Merged

Fix timezone parsing functions for non-hour timezones #1547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .py  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
35 changes: 19 additions & 16 deletions git/objects/util.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -137,22 +137,25 @@ def get_object_type_by_name(


def utctz_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)


def altz_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 < 0 and "-") or "+"
return prefix + 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)
return seconds if int_utctz < 0 else -seconds


def altz_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 = "-" if altz >= 60 else "+"
return "{}{:02}{:02}".format(sign, hours, minutes)


def verify_utctz(offset: str) -> str:
Expand Down
21 changes: 21 additions & 0 deletions test/test_util.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,27 @@ def test_iterable_list(self, case):
self.assertRaises(IndexError, ilist.__delitem__, 0)
self.assertRaises(IndexError, ilist.__delitem__, "something")

def test_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)

def test_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")

def test_from_timestamp(self):
# Correct offset: UTC+2, should return datetime + tzoffset(+2)
altz = utctz_to_altz("+0200")
Expand Down
Back | FazBrowse Home | New Git URL