Skip to content

Pull changes from 0.9 branch #119

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

Open
da4089 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Pull changes from 0.9 branch #119

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b7f6d7
Improve log message for unknown timezone
htgoebel Nov 29, 2021
265020d
Add support for zoneinfo tzinfo sub-classes.
da4089 Sep 9, 2025
d33ef2f
Merge pull request #118 from da4089/bad-tzname
da4089 Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion vobject/icalendar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def getTzid(tzid, smart=True):
tz = timezone(tzid)
registerTzid(toUnicode(tzid), tz)
except UnknownTimeZoneError as e:
logging.error(e)
logging.error("Unknown Timezone: %r", e.args[0])
except ImportError as e:
logging.error(e)
return tz
Expand Down Expand Up @@ -335,6 +335,10 @@ def pickTzid(tzinfo, allowUTC=False):
if tzinfo is None or (not allowUTC and tzinfo_eq(tzinfo, utc)):
return None

# Try a zoneinfo (CPython 3.9+) first.
if hasattr(tzinfo, 'key'):
return toUnicode(tzinfo.key)

# Try pytz tzid key
if hasattr(tzinfo, 'tzid'):
return toUnicode(tzinfo.tzid)
Expand Down
Loading