pyupgrade

src/collective/taxonomy/__init__.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 PATH_SEPARATOR = "\u241F"
 LEGACY_PATH_SEPARATOR = "/"
 PRETTY_PATH_SEPARATOR = " » "

src/collective/taxonomy/behavior.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from collective.taxonomy import generated
 from collective.taxonomy.i18n import CollectiveTaxonomyMessageFactory as _
 from collective.taxonomy.indexer import TaxonomyIndexer
@@ -107,7 +106,7 @@ def removeIndex(self):
             catalog.delIndex(self.field_name)
         except CatalogError:
             logging.info(
-                "Could not delete index {0} .. something is not right.".format(
+                "Could not delete index {} .. something is not right.".format(
                     self.field_name
                 )
             )
@@ -152,7 +151,7 @@ def addIndex(self):
             catalog.addIndex(self.field_name, idx_object)
         except CatalogError:
             logging.info(
-                "Index {0} already exists, we hope it is proper configured".format(
+                "Index {} already exists, we hope it is proper configured".format(
                     self.field_name
                 )  # noqa: E501
             )
@@ -163,7 +162,7 @@ def addMetadata(self):
             catalog.addColumn(self.field_name)
         except CatalogError:
             logging.info(
-                "Column {0} already exists".format(self.field_name)
+                "Column {} already exists".format(self.field_name)
             )  # noqa: E501
 
     def unregisterInterface(self):

src/collective/taxonomy/browser.py

@@ -53,7 +53,7 @@ def translate(self, msgid, domain="", target_language=None):
 
 class VocabularyTuplesView(BrowserView):
     def __init__(self, context, request, vocabulary):
-        super(VocabularyTuplesView, self).__init__(context, request)
+        super().__init__(context, request)
         self.vocabulary = vocabulary
 
     def __call__(self, target_language=None):

src/collective/taxonomy/collectionfilter.py

@@ -41,7 +41,7 @@ def groupby_modifier(groupby):
         behavior = sm.queryUtility(IBehavior, name=taxonomy[1].getGeneratedName())
         taxonomy_field_prefix = behavior.field_prefix
         taxonomy_shortname = taxonomy[1].getShortName()
-        taxonomy_index_name = "{0}{1}".format(taxonomy_field_prefix, taxonomy_shortname)
+        taxonomy_index_name = "{}{}".format(taxonomy_field_prefix, taxonomy_shortname)
         groupby._groupby[taxonomy_index_name] = {
             "index": taxonomy_index_name,
             "metadata": taxonomy_index_name,

src/collective/taxonomy/controlpanel.py

@@ -1,17 +1,16 @@
-# -*- coding: utf-8 -*-
 from collective.taxonomy.exportimport import TaxonomyImportExportAdapter
 from collective.taxonomy.factory import registerTaxonomy
 from collective.taxonomy.i18n import CollectiveTaxonomyMessageFactory as _
 from collective.taxonomy.interfaces import ITaxonomy
 from collective.taxonomy.interfaces import ITaxonomyForm
 from collective.taxonomy.interfaces import ITaxonomySettings
+from io import BytesIO
 from plone import api
 from plone.app.registry.browser import controlpanel
 from plone.behavior.interfaces import IBehavior
 from plone.memoize import view
 from Products.CMFPlone.interfaces import IPloneSiteRoot
 from Products.Five.browser import BrowserView
-from six import BytesIO
 from z3c.form import button
 from z3c.form import field
 from z3c.form import form
@@ -40,7 +39,7 @@ class TaxonomySettingsControlPanelForm(controlpanel.RegistryEditForm):
     description = _("Taxonomy settings")
 
     def updateFields(self):
-        super(TaxonomySettingsControlPanelForm, self).updateFields()
+        super().updateFields()
         self.fields["taxonomies"].widgetFactory = CheckBoxFieldWidget
 
     def updateActions(self):
@@ -64,7 +63,7 @@ def handle_edit_taxonomy_action(self, action):
         data, errors = self.extractData()
         if len(data.get("taxonomies", [])) > 0:
             self.request.RESPONSE.redirect(
-                "{0}/@@taxonomy-edit?form.widgets.taxonomy={1}".format(
+                "{}/@@taxonomy-edit?form.widgets.taxonomy={}".format(
                     self.context.portal_url(), data.get("taxonomies")[0]
                 )
             )
@@ -81,7 +80,7 @@ def handle_edit_taxonomy_data_action(self, action):
         data, errors = self.extractData()
         if len(data.get("taxonomies", [])) > 0:
             self.request.RESPONSE.redirect(
-                "{0}/@@taxonomy-edit-data?taxonomy={1}".format(
+                "{}/@@taxonomy-edit-data?taxonomy={}".format(
                     self.context.portal_url(), data.get("taxonomies")[0]
                 )
             )
@@ -123,7 +122,7 @@ def handle_export_action(self, action):
 
         if len(taxonomies) > 0:
             return self.request.RESPONSE.redirect(
-                "{0}/@@taxonomy-export?taxonomies={1}".format(
+                "{}/@@taxonomy-export?taxonomies={}".format(
                     self.context.portal_url(), ",".join(taxonomies)
                 )
             )  # noqa
@@ -218,7 +217,7 @@ def handleAdd(self, action):
     def handleCancel(self, action):
         api.portal.show_message(_("Add cancelled"), request=self.request)
         self.request.response.redirect(
-            "{0}/@@taxonomy-settings".format(self.context.absolute_url())
+            "{}/@@taxonomy-settings".format(self.context.absolute_url())
         )
 
 
@@ -256,20 +255,20 @@ def handleApply(self, action):
 
             api.portal.show_message(_("Changes saved"), request=self.request)
         self.request.response.redirect(
-            "{0}/@@taxonomy-settings".format(self.context.absolute_url())
+            "{}/@@taxonomy-settings".format(self.context.absolute_url())
         )
 
     @button.buttonAndHandler(_("Cancel"), name="cancel")
     def handleCancel(self, action):
         api.portal.show_message(_("Edit cancelled"), request=self.request)
         self.request.response.redirect(
-            "{0}/@@taxonomy-settings".format(self.context.absolute_url())
+            "{}/@@taxonomy-settings".format(self.context.absolute_url())
         )
 
 
 @adapter(IPloneSiteRoot)
 @implementer(ITaxonomyForm)
-class TaxonomyEditFormAdapter(object):
+class TaxonomyEditFormAdapter:
     purge = False
 
     def __init__(self, context, name=None):

src/collective/taxonomy/exportimport.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from collective.taxonomy.factory import registerTaxonomy
 from collective.taxonomy.interfaces import ITaxonomy
 from collective.taxonomy.vdex import ExportVdex
@@ -7,8 +6,8 @@
 from io import StringIO
 from lxml.etree import fromstring
 from plone.behavior.interfaces import IBehavior
-from six.moves import configparser
 
+import configparser
 import six
 
 
@@ -113,18 +112,15 @@ def exportTaxonomy(context):
                 if value:
                     config.set("taxonomy", name, str(value).lower())
 
-            if six.PY3:
-                filehandle = StringIO()
-            else:
-                filehandle = BytesIO()
+            filehandle = StringIO()
             config.write(filehandle)
             context.writeDataFile(
                 "taxonomies/" + short_name + ".cfg", filehandle.getvalue(), "text/plain"
             )
             context.writeDataFile("taxonomies/" + short_name + ".xml", body, "text/xml")
 
 
-class TaxonomyImportExportAdapter(object):
+class TaxonomyImportExportAdapter:
     IMSVDEX_NS = "http://www.imsglobal.org/xsd/imsvdex_v1p0"
 
     def __init__(self, context):

src/collective/taxonomy/generated.py

@@ -8,7 +8,7 @@
 import sys
 
 
-class Wrapper(object):
+class Wrapper:
     __name__ = __name__
 
     lock = RLock()

src/collective/taxonomy/indexer.py

@@ -17,7 +17,7 @@
 logger = logging.getLogger("collective.taxonomy")
 
 
-class TaxonomyIndexerWrapper(object):
+class TaxonomyIndexerWrapper:
     def __init__(self, field_name, utility_name, context, catalog):
         self.context = context
         self.catalog = catalog
@@ -42,9 +42,7 @@ def __call__(self):
 
         found = []
         stored_element = getattr(self.context, self.field_name)
-        if not isinstance(stored_element, Iterable) or isinstance(
-            stored_element, six.string_types
-        ):
+        if not isinstance(stored_element, Iterable) or isinstance(stored_element, str):
             stored_element = [stored_element]
 
         for language, data in utility.data.items():
@@ -73,7 +71,7 @@ def __call__(self):
 
 @adapter(IDexterityContent, IZCatalog)
 @implementer(IIndexer)
-class TaxonomyIndexer(object):
+class TaxonomyIndexer:
     __name__ = "TaxonomyIndexer"
 
     def __init__(self, field_name, utility_name):

src/collective/taxonomy/interfaces.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from .i18n import CollectiveTaxonomyMessageFactory as _
 from plone import api
 from plone.namedfile.field import NamedBlobFile

src/collective/taxonomy/jsonimpl.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from BTrees.OOBTree import OOBTree
 from collective.taxonomy import PATH_SEPARATOR
 from collective.taxonomy.i18n import CollectiveTaxonomyMessageFactory as _

src/collective/taxonomy/restapi/__init__.py

@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-

src/collective/taxonomy/restapi/serializers/__init__.py

@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-

src/collective/taxonomy/restapi/serializers/taxonomy.py

@@ -12,7 +12,7 @@
 
 @implementer(ISerializeToJson)
 @adapter(ITaxonomy, Interface)
-class TaxonomySerializer(object):
+class TaxonomySerializer:
     """Taxnomy serializer"""
 
     def __init__(self, context, request):

src/collective/taxonomy/restapi/services/__init__.py

@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-

src/collective/taxonomy/restapi/services/controlpanel/__init__.py

@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-

src/collective/taxonomy/restapi/services/controlpanel/controlpanel.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from collective.taxonomy.i18n import CollectiveTaxonomyMessageFactory as _
 from collective.taxonomy.interfaces import IBrowserLayer
 from collective.taxonomy.interfaces import ITaxonomyControlPanel

src/collective/taxonomy/restapi/services/taxonomy/__init__.py

@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-

src/collective/taxonomy/restapi/services/taxonomy/add.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from collective.taxonomy.exportimport import TaxonomyImportExportAdapter
 from collective.taxonomy.factory import registerTaxonomy
 from collective.taxonomy.interfaces import ITaxonomyForm

src/collective/taxonomy/restapi/services/taxonomy/delete.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from collective.taxonomy.i18n import CollectiveTaxonomyMessageFactory as _
 from collective.taxonomy.interfaces import ITaxonomy
 from plone.restapi.services import Service

src/collective/taxonomy/restapi/services/taxonomy/get.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from collective.taxonomy.interfaces import ITaxonomy
 from collective.taxonomy.restapi.utils import get_all_taxonomies
 from collective.taxonomy.vdex import TreeExport

src/collective/taxonomy/restapi/services/taxonomy/schema.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from collective.taxonomy.interfaces import ITaxonomyForm
 from plone.restapi.serializer.controlpanels import get_jsonschema_for_controlpanel
 from plone.restapi.serializer.converters import json_compatible

src/collective/taxonomy/restapi/utils.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from collective.taxonomy.interfaces import ITaxonomy
 from plone.restapi.interfaces import ISerializeToJson
 from zope.component import getMultiAdapter

src/collective/taxonomy/testing.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from plone.app.robotframework.testing import REMOTE_LIBRARY_BUNDLE_FIXTURE
 from plone.app.testing import applyProfile
 from plone.app.testing import FunctionalTesting

src/collective/taxonomy/tests/test_behavior.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from collective.taxonomy.interfaces import ITaxonomy
 from collective.taxonomy.testing import INTEGRATION_TESTING
 from plone import api

src/collective/taxonomy/tests/test_controlpanel.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from collective.taxonomy.testing import FUNCTIONAL_TESTING
 from plone import api
 from plone.app.testing import applyProfile
@@ -29,7 +28,7 @@ def setUp(self):
         self.browser.handleErrors = False
         self.browser.addHeader(
             "Authorization",
-            "Basic {0}:{1}".format(SITE_OWNER_NAME, SITE_OWNER_PASSWORD),
+            "Basic {}:{}".format(SITE_OWNER_NAME, SITE_OWNER_PASSWORD),
         )
         commit()
 

src/collective/taxonomy/tests/test_controlpanel_restapi.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from collective.taxonomy.testing import FUNCTIONAL_TESTING
 from plone.app.testing import applyProfile
 from plone.app.testing import setRoles

src/collective/taxonomy/tests/test_indexer.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from collective.taxonomy.interfaces import ITaxonomy
 from collective.taxonomy.testing import INTEGRATION_TESTING
 from plone import api

src/collective/taxonomy/tests/test_json.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from collective.taxonomy.testing import INTEGRATION_TESTING
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
@@ -16,7 +15,7 @@ class TestJson(unittest.TestCase):
     layer = INTEGRATION_TESTING
 
     def setUp(self):
-        super(TestJson, self).setUp()
+        super().setUp()
         self.portal = self.layer["portal"]
         self.request = self.layer["request"]
         setRoles(self.portal, TEST_USER_ID, ["Manager"])
@@ -111,7 +110,7 @@ class TestEditDataJson(unittest.TestCase):
     layer = INTEGRATION_TESTING
 
     def setUp(self):
-        super(TestEditDataJson, self).setUp()
+        super().setUp()
         self.portal = self.layer["portal"]
         self.request = self.layer["request"]
         setRoles(self.portal, TEST_USER_ID, ["Manager"])

src/collective/taxonomy/tests/test_setup.py

@@ -1,5 +1,5 @@
-# -*- coding: utf-8 -*-
 """Setup tests for this package."""
+
 from collective.taxonomy.testing import INTEGRATION_TESTING
 from plone import api
 from plone.app.testing import setRoles
@@ -16,7 +16,7 @@
 except Exception:
     # Quick shim for 5.1 api change
 
-    class get_installer(object):
+    class get_installer:
         def __init__(self, portal, request):
             self.installer = getToolByName(portal, "portal_quickinstaller")
 

src/collective/taxonomy/tests/test_taxonomy_endpoint.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from collective.taxonomy.testing import FUNCTIONAL_TESTING
 from plone.app.testing import applyProfile
 from plone.app.testing import setRoles
@@ -170,4 +169,4 @@ def test_get_AddTaxonomy_Schema(self):
         fields = [x.get("fields") for x in response["fieldsets"]]
         self.assertIn("field_title", fields[0])
         self.assertIn("taxonomy", fields[0])
-        self.assertNotEquals(response["properties"], {})
+        self.assertNotEqual(response["properties"], {})

src/collective/taxonomy/tests/test_traverser.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from collective.taxonomy.browser import VocabularyTuplesView
 from collective.taxonomy.testing import INTEGRATION_TESTING
 from collective.taxonomy.vocabulary import Vocabulary

src/collective/taxonomy/tests/test_utility.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from collective.taxonomy.interfaces import ITaxonomy
 from collective.taxonomy.testing import INTEGRATION_TESTING
 from zope.component import queryUtility

src/collective/taxonomy/utility.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from BTrees.IOBTree import IOBTree
 from BTrees.OOBTree import OOBTree
 from collective.taxonomy import generated
@@ -267,7 +266,7 @@ def fix(path):
         seen = set()
         for key, value in items:
             if key in seen:
-                logger.warning("Duplicate key entry: %r" % (key,))
+                logger.warning("Duplicate key entry: {!r}".format(key))
 
             seen.add(key)
             update = key in tree