Skip to content

update for python 3.10 #9

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 1 commit into
base: master
Choose a base branch
from
Open

update for python 3.10 #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions vobject/icalendar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,8 @@ def pickTzid(tzinfo, allowUTC=False):
"""
Given a tzinfo class, use known APIs to determine TZID, or use tzname.
"""
if str(tzinfo) == 'UTC':
return None
Copy link

@htgoebel htgoebel Jan 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest merging this clause into the next which has a comment about UTC.

Copy link
Author

@da4089 da4089 Jan 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested a merger of this with the following line, as you suggested. I guess an error from the test suite in branch-0.9:

======================================================================
ERROR: test_pytz_timezone_serializing (__main__.TestIcalendar)
Serializing with timezones from pytz test
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests.py", line 727, in test_pytz_timezone_serializing
    tz.serialize()
  File "/Users/d/work/personal/vobject-tmp/vobject/base.py", line 258, in serialize
    return behavior.serialize(self, buf, lineLength, validate, *args, **kwargs)
  File "/Users/d/work/personal/vobject-tmp/vobject/behavior.py", line 157, in serialize
    cls.validate(obj, raiseException=True)
  File "/Users/d/work/personal/vobject-tmp/vobject/icalendar.py", line 1073, in validate
    raise ValidateError(m)
vobject.base.ValidateError: 'VTIMEZONE components must contain a valid TZID'

----------------------------------------------------------------------

I haven't had a chance to look into this yet. It's quite possible that the test case is incorrect.

Copy link
Author

@da4089 da4089 Jan 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My patch was:

--- a/vobject/icalendar.py
+++ b/vobject/icalendar.py
@@ -332,7 +332,7 @@ class TimezoneComponent(Component):
         """

         # If tzinfo is UTC, we don't need a TZID
-        if tzinfo is None or (not allowUTC and tzinfo_eq(tzinfo, utc)):
+        if tzinfo is None or str(tzinfo) == 'UTC' or (not allowUTC and tzinfo_eq(tzinfo, utc)):
             return None

         # Try pytz tzid key

Copy link

@htgoebel htgoebel Jan 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is strange! Just to exclude a weird case: Have you tried

if str(tzinfo) == 'UTC' of tzinfo is None or (not allowUTC and tzinfo_eq(tzinfo, utc)):

if tzinfo is None or (not allowUTC and tzinfo_eq(tzinfo, utc)):
# If tzinfo is UTC, we don't need a TZID
return None
Expand Down