sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-03-29 09:35:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Flake8

Browse source
This commit is contained in:
Markus Unterwaditzer 2014-05-14 15:47:41 +02:00
parent 98a9748392
commit a33e34bc60
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/storage/__init__.py
View file

@ -107,7 +107,7 @@ class StorageTests(object):
assert not list(s.list())
s.upload(self._create_bogus_item())
assert list(s.list())
def test_discover(self):
collections = set()

2
vdirsyncer/storage/http.py
View file

@ -7,8 +7,6 @@
:license: MIT, see LICENSE for more details.
'''
import hashlib
from .base import Item, Storage
from ..utils import expand_path, get_password, request, text_type, urlparse

6
vdirsyncer/sync.py
View file

@ -195,10 +195,12 @@ def action_conflict_resolve(ident):
raise SyncConflict()
elif conflict_resolution == 'a wins':
sync_logger.info('...{} wins.'.format(a_storage))
action_update(ident, 'a', 'b')(storages, status, conflict_resolution)
action_update(ident, 'a', 'b')(storages, status,
conflict_resolution)
elif conflict_resolution == 'b wins':
sync_logger.info('...{} wins.'.format(b_storage))
action_update(ident, 'b', 'a')(storages, status, conflict_resolution)
action_update(ident, 'b', 'a')(storages, status,
conflict_resolution)
else:
raise ValueError('Invalid conflict resolution mode: {}'
.format(conflict_resolution))