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

Remove workarounds for bugs in VObject

Browse Source 
The bugs got fixed in version 0.9.5
This commit is contained in:
Unrud 2017-07-01 05:18:17 +02:00
parent 92ab06ccb7
commit 56c88b4c54
2 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
radicale/storage.py
View File

@ -1117,20 +1117,9 @@ class Collection(BaseCollection):
ctext = vobject_item.serialize() ctext = vobject_item.serialize()
cetag = get_etag(ctext) cetag = get_etag(ctext)
cuid = get_uid_from_object(vobject_item) cuid = get_uid_from_object(vobject_item)
try:
try: try:
ctag, cstart, cend = xmlutils.find_tag_and_time_range( ctag, cstart, cend = xmlutils.find_tag_and_time_range(
vobject_item) vobject_item)
except xmlutils.VObjectBugException as e:
# HACK: Extraction of metadata failed, because of bugs in
# VObject.
self.logger.warning(
"Failed to find tag and time range of item %r from %r "
"(Bug in VObject): %s", href, self.path, e,
exc_info=True)
ctag = xmlutils.find_tag(vobject_item)
cstart = xmlutils.TIMESTAMP_MIN
cend = xmlutils.TIMESTAMP_MAX
except Exception as e: except Exception as e:
raise RuntimeError("Failed to find tag and time range of item " raise RuntimeError("Failed to find tag and time range of item "
"%r from %r: %s" % (href, self.path, "%r from %r: %s" % (href, self.path,

25
radicale/xmlutils.py
View File

@ -66,10 +66,6 @@ TIMESTAMP_MIN = math.floor(DATETIME_MIN.timestamp())
TIMESTAMP_MAX = math.ceil(DATETIME_MAX.timestamp()) TIMESTAMP_MAX = math.ceil(DATETIME_MAX.timestamp())
class VObjectBugException(Exception):
"""Exception for workarounds related to bugs in VObject."""
def pretty_xml(element, level=0): def pretty_xml(element, level=0):
"""Indent an ElementTree ``element`` and its children.""" """Indent an ElementTree ``element`` and its children."""
if not level: if not level:
@ -290,21 +286,12 @@ def _visit_time_ranges(vobject_item, child_name, range_fn, infinity_fn):
# recurrence should be ignored instead. # recurrence should be ignored instead.
def getrruleset(child): def getrruleset(child):
try:
first_dtstart = next(iter(child.getrruleset(addRDate=True)),
None)
except TypeError as e:
# TODO: The problem was fixed in VObject 0.9.5
raise VObjectBugException(
"failed to call getrruleset: %s" % e) from e
if first_dtstart is None:
# TODO: The problem was fixed in VObject 0.9.5
raise VObjectBugException(
"empty iterator from getrruleset")
if (hasattr(child, "rrule") and if (hasattr(child, "rrule") and
";UNTIL=" not in child.rrule.value.upper() and ";UNTIL=" not in child.rrule.value.upper() and
";COUNT=" not in child.rrule.value.upper()): ";COUNT=" not in child.rrule.value.upper()):
if infinity_fn(_date_to_datetime(first_dtstart)): first_dtstart = next(iter(child.getrruleset(addRDate=True)), None)
if (first_dtstart is not None and
infinity_fn(_date_to_datetime(first_dtstart))):
return (), True return (), True
return child.getrruleset(addRDate=True), False return child.getrruleset(addRDate=True), False
@ -1137,12 +1124,6 @@ def report(base_prefix, path, xml_request, collection):
if not all(match(item, filter_[0]) for filter_ in filters if not all(match(item, filter_[0]) for filter_ in filters
if filter_): if filter_):
continue continue
except VObjectBugException as e:
# HACK: Just return all items that can't be filtered because
# of bugs in VObject.
collection.logger.warning(
"Failed to filter item %r from %r (Bug in VObject): %s",
item.href, collection.path, e, exc_info=True)
except Exception as e: except Exception as e:
raise RuntimeError("Failed to filter item %r from %r: %s" % raise RuntimeError("Failed to filter item %r from %r: %s" %
(item.href, collection.path, e)) from e (item.href, collection.path, e)) from e