tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

solving bug when trying to filter an Event on a DATETIME which have no timezone

Browse Source
This commit is contained in:
Nicolas Bonfante 2016-06-24 14:02:35 +02:00
parent 1cf8ec0599
commit dfc215b63f
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
radicale/xmlutils.py
View File

@ -220,6 +220,9 @@ def _time_range_match(vobject_item, filter_, child_name):
if child_name == "VEVENT": if child_name == "VEVENT":
# TODO: check if there's a timezone # TODO: check if there's a timezone
dtstart = child.dtstart.value dtstart = child.dtstart.value
if isinstance(dtstart, datetime) and not dtstart.tzinfo:
dtstart = dtstart.replace(tzinfo=timezone.utc)
if not isinstance(dtstart, datetime): if not isinstance(dtstart, datetime):
dtstart_is_datetime = False dtstart_is_datetime = False
# TODO: changing dates to datetimes may be wrong because of tz # TODO: changing dates to datetimes may be wrong because of tz
@ -235,6 +238,9 @@ def _time_range_match(vobject_item, filter_, child_name):
if not isinstance(dtend, datetime): if not isinstance(dtend, datetime):
dtend = datetime.combine(dtend, datetime.min.time()).replace( dtend = datetime.combine(dtend, datetime.min.time()).replace(
tzinfo=timezone.utc) tzinfo=timezone.utc)
if isinstance(dtend, datetime) and not dtend.tzinfo:
dtend = dtend.replace(tzinfo=timezone.utc)
return start < dtend and end > dtstart return start < dtend and end > dtstart
elif duration is not None: elif duration is not None:
duration = duration.value duration = duration.value