Repository navigation
Conversation
An EXDATE with VALUE=DATE was added to the rruleset as a naive midnight datetime. When DTSTART is a time zone aware DATE-TIME, iterating the rruleset raised "can't compare offset-naive and offset-aware datetimes"; with a floating DTSTART the exclusion silently matched nothing. Give such dates DTSTART's time of day and time zone so they exclude the occurrence on that day. Fixes py-vobject#68
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
An
EXDATE;VALUE=DATE:...is turned into a naive midnight datetime before it goes into the rruleset. That breaks in two ways when DTSTART is a DATE-TIME:ZorTZID=), iteratinggetrruleset()raisesTypeError: can't compare offset-naive and offset-aware datetimes. That's the traceback in Fail to return end date for ended recurring VEVENT #68.18:00occurrences, never matches, and nothing gets excluded.This change gives a date-valued EXDATE the same time of day and tzinfo as DTSTART (
datetime.combine(date, dtstart.timetz())). That's how dateutil builds the occurrences, so the value matches the occurrence on that day. All-day events (date DTSTART) and RDATE handling are unchanged.Fixes #68
Before (the
.icsfrom the issue, trimmed):After: 6 occurrences, without 2016-05-04 and 2016-06-08. I also checked that exclusions on the far side of a DST change still match for
TZID=Europe/OsloandTZID=US/Pacific.Tests
test_recurrence_exdate_date_value_with_datetime_dtstart(aware and floating DTSTART). It fails onmasterand passes with the fix.pytest: 78 passedpre-commit runon the changed files (isort, black, flake8, pylint): all pass