From 762a3b219bec3bedb4476efb9056d43af2244f2a Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Fri, 28 Mar 2014 21:44:43 +0100 Subject: [PATCH] Flake 8 --- tests/storage/__init__.py | 3 ++- vdirsyncer/storage/dav.py | 3 +-- vdirsyncer/utils.py | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/storage/__init__.py b/tests/storage/__init__.py index d79c03d..d140c57 100644 --- a/tests/storage/__init__.py +++ b/tests/storage/__init__.py @@ -104,7 +104,8 @@ class StorageTests(object): # Create collections on-the-fly for most storages # Except ownCloud, which already has all of them, and more i += 1 - s = self.storage_class(**self.get_storage_args(collection=collection)) + s = self.storage_class( + **self.get_storage_args(collection=collection)) item = self._create_bogus_item(str(i)) s.upload(item) items.add(item.raw) diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py index 574c513..ceb5252 100644 --- a/vdirsyncer/storage/dav.py +++ b/vdirsyncer/storage/dav.py @@ -12,6 +12,7 @@ from .http import HttpStorageBase import vdirsyncer.exceptions as exceptions import vdirsyncer.log as log import requests +import datetime import urlparse from lxml import etree @@ -233,8 +234,6 @@ class DavStorage(HttpStorageBase): yield href, etag - - class CaldavStorage(DavStorage): fileext = '.ics' diff --git a/vdirsyncer/utils.py b/vdirsyncer/utils.py index ff5254d..0f9d05d 100644 --- a/vdirsyncer/utils.py +++ b/vdirsyncer/utils.py @@ -100,7 +100,8 @@ def get_password(username, resource): password = None while True: - password = keyring.get_password(password_key_prefix + key, username) + password = keyring.get_password(password_key_prefix + key, + username) if password is not None: return password @@ -139,6 +140,7 @@ def get_password(username, resource): prompt = 'Save this password in the keyring? [y/N] ' answer = raw_input(prompt).lower() if answer == 'y': - keyring.set_password(password_key_prefix + resource, username, password) + keyring.set_password(password_key_prefix + resource, + username, password) return password