Remove python2 leftover code

Author: Hugo Osvaldo Barrera

docs/conf.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import datetime
 import os
 
@@ -12,8 +10,8 @@
 source_suffix = '.rst'
 master_doc = 'index'
 
-project = u'vdirsyncer'
-copyright = (u'2014-{}, Markus Unterwaditzer & contributors'
+project = 'vdirsyncer'
+copyright = ('2014-{}, Markus Unterwaditzer & contributors'
              .format(datetime.date.today().strftime('%Y')))
 
 release = setuptools_scm.get_version(root='..', relative_to=__file__)
@@ -44,18 +42,18 @@
 
 latex_elements = {}
 latex_documents = [
-    ('index', 'vdirsyncer.tex', u'vdirsyncer Documentation',
-     u'Markus Unterwaditzer', 'manual'),
+    ('index', 'vdirsyncer.tex', 'vdirsyncer Documentation',
+     'Markus Unterwaditzer', 'manual'),
 ]
 
 man_pages = [
-    ('index', 'vdirsyncer', u'vdirsyncer Documentation',
-     [u'Markus Unterwaditzer'], 1)
+    ('index', 'vdirsyncer', 'vdirsyncer Documentation',
+     ['Markus Unterwaditzer'], 1)
 ]
 
 texinfo_documents = [
-    ('index', 'vdirsyncer', u'vdirsyncer Documentation',
-     u'Markus Unterwaditzer', 'vdirsyncer',
+    ('index', 'vdirsyncer', 'vdirsyncer Documentation',
+     'Markus Unterwaditzer', 'vdirsyncer',
      'Synchronize calendars and contacts.', 'Miscellaneous'),
 ]
 

setup.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 '''
 Vdirsyncer synchronizes calendars and contacts.
 

tests/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 '''
 Test suite for vdirsyncer.
 '''
@@ -21,7 +20,7 @@ def assert_item_equals(a, b):
     assert normalize_item(a) == normalize_item(b)
 
 
-VCARD_TEMPLATE = u'''BEGIN:VCARD
+VCARD_TEMPLATE = '''BEGIN:VCARD
 VERSION:3.0
 FN:Cyrus Daboo
 N:Daboo;Cyrus;;;
@@ -37,7 +36,7 @@ def assert_item_equals(a, b):
 UID:{uid}
 END:VCARD'''
 
-TASK_TEMPLATE = u'''BEGIN:VCALENDAR
+TASK_TEMPLATE = '''BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//dmfs.org//mimedir.icalendar//EN
 BEGIN:VTODO
@@ -52,7 +51,7 @@ def assert_item_equals(a, b):
 END:VCALENDAR'''
 
 
-BARE_EVENT_TEMPLATE = u'''BEGIN:VEVENT
+BARE_EVENT_TEMPLATE = '''BEGIN:VEVENT
 DTSTART:19970714T170000Z
 DTEND:19970715T035959Z
 SUMMARY:Bastille Day Party
@@ -61,10 +60,10 @@ def assert_item_equals(a, b):
 END:VEVENT'''
 
 
-EVENT_TEMPLATE = u'''BEGIN:VCALENDAR
+EVENT_TEMPLATE = '''BEGIN:VCALENDAR
 VERSION:2.0
 PRODID:-//hacksw/handcal//NONSGML v1.0//EN
-''' + BARE_EVENT_TEMPLATE + u'''
+''' + BARE_EVENT_TEMPLATE + '''
 END:VCALENDAR'''
 
 EVENT_WITH_TIMEZONE_TEMPLATE = '''BEGIN:VCALENDAR
@@ -90,7 +89,7 @@ def assert_item_equals(a, b):
 END:VCALENDAR'''
 
 
-SIMPLE_TEMPLATE = u'''BEGIN:FOO
+SIMPLE_TEMPLATE = '''BEGIN:FOO
 UID:{uid}
 X-SOMETHING:{r}
 HAHA:YES

tests/conftest.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 '''
 General-purpose fixtures for vdirsyncer's testsuite.
 '''

tests/storage/__init__.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import random
 import uuid
 
@@ -31,7 +29,7 @@ def format_item(item_template, uid=None):
     return Item(item_template.format(r=r, uid=uid or r))
 
 
-class StorageTests(object):
+class StorageTests:
     storage_class = None
     supports_collections = True
     supports_metadata = True
@@ -173,10 +171,10 @@ def test_update_others_stay_the_same(self, s, get_item):
                 _, etag = s.get(href)
             info[href] = etag
 
-        assert dict(
-            (href, etag) for href, item, etag
+        assert {
+            href: etag for href, item, etag
             in s.get_multi(href for href, etag in info.items())
-        ) == info
+        } == info
 
     def test_repr(self, s, get_storage_args):
         assert self.storage_class.__name__ in repr(s)
@@ -191,10 +189,10 @@ def test_discover(self, requires_collections, get_storage_args, get_item):
             s.upload(get_item())
             collections.add(s.collection)
 
-        actual = set(
+        actual = {
             c['collection'] for c in
             self.storage_class.discover(**get_storage_args(collection=None))
-        )
+        }
 
         assert actual >= collections
 
@@ -212,7 +210,7 @@ def test_create_collection(self, requires_collections, get_storage_args,
         )
 
         href = s.upload(get_item())[0]
-        assert href in set(href for href, etag in s.list())
+        assert href in {href for href, etag in s.list()}
 
     def test_discover_collection_arg(self, requires_collections,
                                      get_storage_args):
@@ -255,7 +253,7 @@ def test_specialchars(self, monkeypatch, requires_collections,
 
         monkeypatch.setattr('vdirsyncer.utils.generate_href', lambda x: x)
 
-        uid = u'test @ foo ät bar град сатану'
+        uid = 'test @ foo ät bar град сатану'
         collection = 'test @ foo ät bar'
 
         s = self.storage_class(**get_storage_args(collection=collection))
@@ -286,12 +284,12 @@ def test_metadata(self, requires_metadata, s):
         try:
             s.set_meta('color', None)
             assert not s.get_meta('color')
-            s.set_meta('color', u'#ff0000')
-            assert s.get_meta('color') == u'#ff0000'
+            s.set_meta('color', '#ff0000')
+            assert s.get_meta('color') == '#ff0000'
         except exceptions.UnsupportedMetadataError:
             pass
 
-        for x in (u'hello world', u'hello wörld'):
+        for x in ('hello world', 'hello wörld'):
             s.set_meta('displayname', x)
             rv = s.get_meta('displayname')
             assert rv == x
@@ -315,7 +313,7 @@ def test_recurring_events(self, s, item_type):
             pytest.skip('This storage instance doesn\'t support iCalendar.')
 
         uid = str(uuid.uuid4())
-        item = Item(textwrap.dedent(u'''
+        item = Item(textwrap.dedent('''
         BEGIN:VCALENDAR
         VERSION:2.0
         BEGIN:VEVENT

tests/storage/conftest.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import pytest
 
 import uuid

tests/storage/dav/__init__.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import uuid
 
 import os
@@ -27,7 +25,7 @@ class DAVStorageTests(ServerMixin, StorageTests):
     @pytest.mark.skipif(dav_server == 'radicale',
                         reason='Radicale is very tolerant.')
     def test_dav_broken_item(self, s):
-        item = Item(u'HAHA:YES')
+        item = Item('HAHA:YES')
         with pytest.raises((exceptions.Error, requests.exceptions.HTTPError)):
             s.upload(item)
         assert not list(s.list())
@@ -50,7 +48,7 @@ def test_dav_unicode_href(self, s, get_item, monkeypatch):
 
         monkeypatch.setattr(s, '_get_href',
                             lambda item: item.ident + s.fileext)
-        item = get_item(uid=u'град сатану' + str(uuid.uuid4()))
+        item = get_item(uid='град сатану' + str(uuid.uuid4()))
         href, etag = s.upload(item)
         item2, etag2 = s.get(href)
         assert_item_equals(item, item2)

tests/storage/dav/test_caldav.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import datetime
 from textwrap import dedent
 
@@ -64,7 +62,7 @@ def test_timerange_correctness(self, get_storage_args):
         s = self.storage_class(start_date=start_date, end_date=end_date,
                                **get_storage_args())
 
-        too_old_item = format_item(dedent(u'''
+        too_old_item = format_item(dedent('''
             BEGIN:VCALENDAR
             VERSION:2.0
             PRODID:-//hacksw/handcal//NONSGML v1.0//EN
@@ -78,7 +76,7 @@ def test_timerange_correctness(self, get_storage_args):
             END:VCALENDAR
             ''').strip())
 
-        too_new_item = format_item(dedent(u'''
+        too_new_item = format_item(dedent('''
             BEGIN:VCALENDAR
             VERSION:2.0
             PRODID:-//hacksw/handcal//NONSGML v1.0//EN
@@ -92,7 +90,7 @@ def test_timerange_correctness(self, get_storage_args):
             END:VCALENDAR
             ''').strip())
 
-        good_item = format_item(dedent(u'''
+        good_item = format_item(dedent('''
             BEGIN:VCALENDAR
             VERSION:2.0
             PRODID:-//hacksw/handcal//NONSGML v1.0//EN

tests/storage/dav/test_carddav.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import pytest
 
 from vdirsyncer.storage.dav import CardDAVStorage

tests/storage/etesync/test_main.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import shutil
 import os
 import sys