From 836623946d85102f2f45b9c36b024a4b65b9c39b Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Thu, 5 Mar 2015 18:27:59 +0100 Subject: [PATCH] Avoid lookup in hashtable --- vdirsyncer/sync.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/vdirsyncer/sync.py b/vdirsyncer/sync.py index 06cdf37..2904623 100644 --- a/vdirsyncer/sync.py +++ b/vdirsyncer/sync.py @@ -115,13 +115,11 @@ class StorageInfo(object): props = self.idents.setdefault(item.ident, {}) props['item'] = item props['ident'] = item.ident - props.setdefault('etag', etag) - props.setdefault('href', href) - if props['href'] != href: + if props.setdefault('href', href) != href: raise IdentConflict(storage=self.storage, hrefs=[props['href'], href]) - if props['etag'] != etag: + if props.setdefault('etag', etag) != etag: raise SyncError('Etag changed during sync.')