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

Remove item cache tag

Browse Source 
This is not required any more, because the workarounds for bugs in VObject were removed.
This commit is contained in:
Unrud
2017-08-02 17:16:41 +02:00
parent 263f76f88e
commit 6d5374f690
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
radicale/storage.py
View File

@@ -43,7 +43,6 @@ from itertools import chain, groupby
from random import getrandbits from random import getrandbits
from tempfile import NamedTemporaryFile, TemporaryDirectory from tempfile import NamedTemporaryFile, TemporaryDirectory
import pkg_resources
import vobject import vobject
if sys.version_info >= (3, 5): if sys.version_info >= (3, 5):
@@ -704,8 +703,6 @@ class BaseCollection:
class Collection(BaseCollection): class Collection(BaseCollection):
"""Collection stored in several files per calendar.""" """Collection stored in several files per calendar."""
_item_cache_tag = None
def __init__(self, path, principal=None, folder=None): def __init__(self, path, principal=None, folder=None):
# DEPRECATED: Remove useless principal attribute # DEPRECATED: Remove useless principal attribute
if folder is None: if folder is None:
@@ -720,15 +717,6 @@ class Collection(BaseCollection):
self._filesystem_path, ".Radicale.props") self._filesystem_path, ".Radicale.props")
self._meta_cache = None self._meta_cache = None
self._etag_cache = None self._etag_cache = None
if self._item_cache_tag is None:
try:
vobject_version = pkg_resources.require("vobject")[0].version
self.logger.debug("VObject version: %r", vobject_version)
except Exception as e:
self.logger.warning(
"VObject version not found: %s", e, exc_info=True)
vobject_version = ""
Collection._item_cache_tag = vobject_version.encode() + b"\0"
self._item_cache_cleaned = False self._item_cache_cleaned = False
@classmethod @classmethod
@@ -1189,7 +1177,6 @@ class Collection(BaseCollection):
def _item_cache_hash(self, raw_text): def _item_cache_hash(self, raw_text):
_hash = md5() _hash = md5()
_hash.update(self._item_cache_tag)
_hash.update(raw_text) _hash.update(raw_text)
return _hash.hexdigest() return _hash.hexdigest()