From 598d3600cd9f2c865d5076c9339996606ba5925f Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Thu, 23 Apr 2015 16:21:41 +0200 Subject: [PATCH] stylefix --- tests/utils/test_vobject.py | 2 -- vdirsyncer/utils/vobject.py | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/utils/test_vobject.py b/tests/utils/test_vobject.py index 1b438cb..265332e 100644 --- a/tests/utils/test_vobject.py +++ b/tests/utils/test_vobject.py @@ -2,8 +2,6 @@ from textwrap import dedent -import pytest - import vdirsyncer.utils.vobject as vobject from .. import BARE_EVENT_TEMPLATE, EVENT_TEMPLATE, VCARD_TEMPLATE, \ diff --git a/vdirsyncer/utils/vobject.py b/vdirsyncer/utils/vobject.py index cfa6734..47687f2 100644 --- a/vdirsyncer/utils/vobject.py +++ b/vdirsyncer/utils/vobject.py @@ -3,7 +3,7 @@ import hashlib from itertools import chain, tee -from . import cached_property, split_sequence, uniq +from . import cached_property, uniq from .compat import text_type @@ -104,6 +104,7 @@ def split_collection(text): assert isinstance(text, text_type) inline = [] items = [] + def inner(item, main): if item.name == u'VTIMEZONE': inline.append(item) @@ -134,6 +135,7 @@ _default_join_wrappers = { u'VCARD': u'VADDRESSBOOK' } + def join_collection(items, wrappers=_default_join_wrappers): ''' :param wrappers: {