Add support for Python 3.11 + isort imports.

CHANGES.rst

@@ -1,12 +1,12 @@
 Changes
 =======
 
-4.3.1 (unreleased)
-------------------
+4.4 (unreleased)
+----------------
 
 - Add back support for Python 3.5.
 
-- Add support for Python 3.10.
+- Add support for Python 3.10, 3.11.
 
 
 4.3.0 (2020-10-14)

setup.py

@@ -18,9 +18,11 @@
 ##############################################################################
 """Setup for zope.dublincore package
 """
-from setuptools import setup, find_packages
 import os.path
 
+from setuptools import find_packages
+from setuptools import setup
+
 
 def read(*path):
     with open(os.path.join(*path)) as f:
@@ -47,7 +49,7 @@ def read(*path):
 
 setup(
     name="zope.dublincore",
-    version='4.3.1.dev0',
+    version='4.4.dev0',
     url='http://github.com/zopefoundation/zope.dublincore',
     license='ZPL 2.1',
     description='Zope Dublin Core implementation',
@@ -71,6 +73,7 @@ def read(*path):
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Internet :: WWW/HTTP',

src/zope/dublincore/annotatableadapter.py

@@ -13,18 +13,20 @@
 ##############################################################################
 """Dublin Core Annotatable Adapter
 """
-from persistent.dict import PersistentDict
+import six
 
+from persistent.dict import PersistentDict
 from zope.annotation.interfaces import IAnnotatable
 from zope.annotation.interfaces import IAnnotations
 from zope.component import adapter
 from zope.interface import implementer
 from zope.location import Location
+
 from zope.dublincore.interfaces import IWriteZopeDublinCore
 from zope.dublincore.zopedublincore import DateProperty
 from zope.dublincore.zopedublincore import ScalarProperty
 from zope.dublincore.zopedublincore import ZopeDublinCore
-import six
+
 
 DCkey = "zope.app.dublincore.ZopeDublinCore"
 

src/zope/dublincore/browser/metadataedit.py

@@ -14,10 +14,14 @@
 """Dublin Core Meta Data View
 """
 from datetime import datetime
+
 from zope.event import notify
-from zope.dublincore.interfaces import IZopeDublinCore
-from zope.lifecycleevent import ObjectModifiedEvent, Attributes
 from zope.i18nmessageid import MessageFactory
+from zope.lifecycleevent import Attributes
+from zope.lifecycleevent import ObjectModifiedEvent
+
+from zope.dublincore.interfaces import IZopeDublinCore
+
 
 _ = MessageFactory('zope')
 text_type = type(u'')  # PY3

src/zope/dublincore/browser/tests/test_metadataedit.py

@@ -1,9 +1,11 @@
-from zope.component.testing import PlacelessSetup
-from zope.dublincore.browser.metadataedit import MetaDataEdit
-from zope.publisher.browser import TestRequest
 import unittest
+
 import zope.annotation.interfaces
+from zope.component.testing import PlacelessSetup
+from zope.publisher.browser import TestRequest
+
 import zope.dublincore.testing
+from zope.dublincore.browser.metadataedit import MetaDataEdit
 
 
 @zope.interface.implementer(zope.annotation.interfaces.IAnnotations)

src/zope/dublincore/creatorannotator.py

@@ -13,10 +13,12 @@
 ##############################################################################
 """Object that takes care of annotating the dublin core creator field.
 """
-from zope.dublincore.interfaces import IZopeDublinCore
 from zope.security.management import queryInteraction
 from zope.security.proxy import removeSecurityProxy
 
+from zope.dublincore.interfaces import IZopeDublinCore
+
+
 try:
     unicode
 except NameError:

src/zope/dublincore/dcsv.py

@@ -20,6 +20,7 @@
 """
 import re
 
+
 __all__ = "encode", "decode"
 
 try:

src/zope/dublincore/dcterms.py

@@ -13,9 +13,11 @@
 ##############################################################################
 """Support information for qualified Dublin Core Metadata.
 """
-from zope.dublincore import dcsv
 import six
 
+from zope.dublincore import dcsv
+
+
 # useful namespace URIs
 DC_NS = "http://purl.org/dc/elements/1.1/"
 DCTERMS_NS = "http://purl.org/dc/terms/"

src/zope/dublincore/interfaces.py

@@ -14,7 +14,10 @@
 """Dublin Core interfaces
 """
 from zope.interface import Interface
-from zope.schema import Text, TextLine, Datetime, Tuple
+from zope.schema import Datetime
+from zope.schema import Text
+from zope.schema import TextLine
+from zope.schema import Tuple
 
 
 class IDublinCoreElementItem(Interface):

src/zope/dublincore/property.py

@@ -14,9 +14,9 @@
 """Base DublinCore property adapter.
 """
 from zope import schema
-
 from zope.dublincore.interfaces import IZopeDublinCore
 
+
 _marker = object()
 
 

src/zope/dublincore/testing.py

@@ -14,9 +14,11 @@
 """Testing support
 """
 import re
-from zope import component
+
 from zope.testing import renormalizing
 
+from zope import component
+
 from .annotatableadapter import ZDCAnnotatableAdapter
 from .interfaces import IWriteZopeDublinCore
 

src/zope/dublincore/tests/test_annotatableadapter.py

@@ -15,6 +15,7 @@
 """
 import unittest
 
+
 _marker = object()
 
 
@@ -35,9 +36,10 @@ def _getTargetClass(self):
         return ZDCAnnotatableAdapter
 
     def _registerAnnotations(self, dcdata=None):
+        from zope.annotation.interfaces import IAnnotations
         from zope.component import provideAdapter
         from zope.interface import Interface
-        from zope.annotation.interfaces import IAnnotations
+
         from zope.dublincore.annotatableadapter import DCkey
 
         class _Annotations(dict):
@@ -63,11 +65,13 @@ class DummyContext(object):
 
     def test_class_conforms_to_IWriteZopeDublinCore(self):
         from zope.interface.verify import verifyClass
+
         from zope.dublincore.interfaces import IWriteZopeDublinCore
         verifyClass(IWriteZopeDublinCore, self._getTargetClass())
 
     def test_instance_conforms_to_IWriteZopeDublinCore(self):
         from zope.interface.verify import verifyObject
+
         from zope.dublincore.interfaces import IWriteZopeDublinCore
         self._registerAnnotations()
         verifyObject(IWriteZopeDublinCore, self._makeOne())
@@ -196,8 +200,8 @@ def __init__(self, context):
 class Test_partialAnnotatableAdapterFactory(unittest.TestCase):
 
     def _callFUT(self, direct_fields):
-        from zope.dublincore.annotatableadapter \
-            import partialAnnotatableAdapterFactory
+        from zope.dublincore.annotatableadapter import \
+            partialAnnotatableAdapterFactory
         return partialAnnotatableAdapterFactory(direct_fields)
 
     def test_w_empty_list_raises(self):

src/zope/dublincore/tests/test_creatorannotator.py

@@ -25,8 +25,8 @@ def setUp(self):
         self._registerAdapter()
 
     def tearDown(self):
-        from zope.testing.cleanup import cleanUp
         from zope.security.management import endInteraction
+        from zope.testing.cleanup import cleanUp
         endInteraction()
         cleanUp()
 
@@ -44,6 +44,7 @@ class IDummyContent(Interface):
 
     def _registerAdapter(self):
         from zope.component import provideAdapter
+
         from zope.dublincore.interfaces import IZopeDublinCore
         provideAdapter(DummyDCAdapter, (self._iface, ), IZopeDublinCore)
 

src/zope/dublincore/tests/test_dcsv.py

@@ -14,8 +14,10 @@
 """Test the Dublin Core Structured Value support functions.
 """
 from doctest import DocTestSuite
+
 # Imports needed inside the doctests:
-from zope.dublincore.dcsv import encode, decode
+from zope.dublincore.dcsv import decode
+from zope.dublincore.dcsv import encode
 
 
 # TODO still need tests for errors, and createMapping()

src/zope/dublincore/tests/test_xmlmetadata.py

@@ -16,7 +16,8 @@
 import unittest
 
 from zope.dublincore import dcterms
-from zope.dublincore.xmlmetadata import dumpString, parseString
+from zope.dublincore.xmlmetadata import dumpString
+from zope.dublincore.xmlmetadata import parseString
 
 
 class XMLDublinCoreLoadingTests(unittest.TestCase):

src/zope/dublincore/tests/test_zcml.py

@@ -14,6 +14,7 @@
 """ Tests that ZCML can be loaded.
 """
 import unittest
+
 import zope.component.testing
 
 
@@ -27,6 +28,7 @@ def test_loadable(self):
         #        support:  its purpose is to ensure that the package's
         #        ZCML file is loadable *without* loading any other ZCML.
         from zope.configuration.xmlconfig import file
+
         import zope.dublincore
         return file('configure.zcml', package=zope.dublincore)
 

src/zope/dublincore/tests/test_zopedublincore.py

@@ -21,6 +21,7 @@ class Test(TestCase):
 
     def testImplementa(self):
         from zope.interface.verify import verifyObject
+
         from zope.dublincore.interfaces import IZopeDublinCore
         verifyObject(IZopeDublinCore, self.dc)
 

src/zope/dublincore/timeannotators.py

@@ -14,10 +14,13 @@
 """Objects that take care of annotating dublin core meta data times
 """
 from datetime import datetime
+
 import pytz
-from zope.dublincore.interfaces import IZopeDublinCore
 from zope.security.proxy import removeSecurityProxy
 
+from zope.dublincore.interfaces import IZopeDublinCore
+
+
 _NOW = None
 
 

src/zope/dublincore/xmlmetadata.py

@@ -15,11 +15,12 @@
 """
 import xml.sax
 import xml.sax.handler
-
-from xml.sax.saxutils import escape, quoteattr
+from xml.sax.saxutils import escape
+from xml.sax.saxutils import quoteattr
 
 from zope.dublincore import dcterms
 
+
 try:
     from cStringIO import StringIO
 except ImportError:

src/zope/dublincore/zopedublincore.py

@@ -15,10 +15,13 @@
 """
 from datetime import datetime
 
-from zope.interface import implementer
+import six
+
 from zope.datetime import parseDatetimetz
+from zope.interface import implementer
+
 from zope.dublincore.interfaces import IZopeDublinCore
-import six
+
 
 try:
     unicode