Apply isort rules.

.meta.toml

@@ -2,7 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/c-code
 [meta]
 template = "c-code"
-commit-id = "ab709c2e22dff33a005b4237df8a2e0b6baf2f7b"
+commit-id = "dbaca5f3c7785b7bca563dabc5f440544069a8f9"
 
 [python]
 with-appveyor = true
@@ -44,6 +44,7 @@ additional-rules = [
     "include *.sh",
     "include compat.cfg",
     "recursive-include docs *.bat",
+    "recursive-include src *.h",
     "recursive-include src *.rst",
     "recursive-include src *.zcml",
     ]

MANIFEST.in

@@ -17,5 +17,6 @@ recursive-include src *.py
 include *.sh
 include compat.cfg
 recursive-include docs *.bat
+recursive-include src *.h
 recursive-include src *.rst
 recursive-include src *.zcml

setup.py

@@ -21,7 +21,9 @@
 import os
 import sys
 
-from setuptools import setup, find_packages, Extension
+from setuptools import Extension
+from setuptools import find_packages
+from setuptools import setup
 
 
 def read(*rnames):
@@ -141,6 +143,7 @@ def __iter__(self):
     'six',
     'zope.cachedescriptors',
     'zope.component',
+    'zope.deferredimport',
     'zope.dottedname',
     'zope.event',
     'zope.filerepresentation',

src/zope/container/_proxy.py

@@ -12,10 +12,10 @@
 #
 ##############################################################################
 
+from persistent import Persistent
 from zope.proxy import AbstractPyProxyBase
-from zope.container._util import use_c_impl
 
-from persistent import Persistent
+from zope.container._util import use_c_impl
 
 
 _MARKER = object()

src/zope/container/_util.py

@@ -16,8 +16,8 @@
 import sys
 import types
 
-from zope.interface import implementedBy
 from zope.interface import classImplements
+from zope.interface import implementedBy
 
 
 def _c_optimizations_required():

src/zope/container/btree.py

@@ -15,14 +15,16 @@
 """
 __docformat__ = 'restructuredtext'
 
-from persistent import Persistent
-from BTrees.OOBTree import OOBTree
 from BTrees.Length import Length
+from BTrees.OOBTree import OOBTree
+from persistent import Persistent
+from zope.cachedescriptors.property import Lazy
+from zope.interface import implementer
 
+from zope.container.contained import Contained
+from zope.container.contained import setitem
+from zope.container.contained import uncontained
 from zope.container.interfaces import IBTreeContainer
-from zope.container.contained import Contained, setitem, uncontained
-from zope.interface import implementer
-from zope.cachedescriptors.property import Lazy
 
 
 @implementer(IBTreeContainer)

src/zope/container/constraints.py

@@ -153,13 +153,15 @@
 
 import sys
 
+import zope.schema
 from zope.cachedescriptors.property import readproperty
 from zope.dottedname.resolve import resolve
-import zope.schema
 from zope.interface import providedBy
-from zope.container.interfaces import InvalidItemType, InvalidContainerType
+
 from zope.container.i18n import ZopeMessageFactory as _
 from zope.container.interfaces import IContainer
+from zope.container.interfaces import InvalidContainerType
+from zope.container.interfaces import InvalidItemType
 
 
 def checkObject(container, name, object):

src/zope/container/contained.py

@@ -17,33 +17,29 @@
 from six import text_type
 
 import zope.component
-
-from zope.interface import providedBy
+from zope.event import notify
 from zope.interface import Interface
 from zope.interface import implementedBy
-from zope.interface.declarations import getObjectSpecification
+from zope.interface import providedBy
 from zope.interface.declarations import Provides
-
-from zope.event import notify
-
-from zope.location.interfaces import ILocation, ISublocations
-from zope.location.interfaces import IContained
-
-from zope.security.checker import selectChecker, CombinedChecker
-
+from zope.interface.declarations import getObjectSpecification
+from zope.lifecycleevent import ObjectAddedEvent
 from zope.lifecycleevent import ObjectModifiedEvent
 from zope.lifecycleevent import ObjectMovedEvent
-from zope.lifecycleevent import ObjectAddedEvent
 from zope.lifecycleevent import ObjectRemovedEvent
+from zope.location.interfaces import IContained
+from zope.location.interfaces import ILocation
+from zope.location.interfaces import ISublocations
+from zope.security.checker import CombinedChecker
+from zope.security.checker import selectChecker
 
-
+from zope.container._proxy import ContainedProxyBase
+from zope.container._proxy import getProxiedObject
 from zope.container.i18n import ZopeMessageFactory as _
-from zope.container.interfaces import INameChooser
-from zope.container.interfaces import IReservedNames, NameReserved
 from zope.container.interfaces import IContainerModifiedEvent
-
-from zope.container._proxy import getProxiedObject
-from zope.container._proxy import ContainedProxyBase
+from zope.container.interfaces import INameChooser
+from zope.container.interfaces import IReservedNames
+from zope.container.interfaces import NameReserved
 
 
 try:

src/zope/container/directory.py

@@ -23,14 +23,14 @@
 """
 __docformat__ = 'restructuredtext'
 
-from zope.interface import implementer
+from six.moves import map
 
+import zope.filerepresentation.interfaces
 from zope.component.interfaces import ISite
-from zope.container.folder import Folder
+from zope.interface import implementer
 from zope.security.proxy import removeSecurityProxy
-import zope.filerepresentation.interfaces
 
-from six.moves import map
+from zope.container.folder import Folder
 
 
 MARKER = object()

src/zope/container/find.py

@@ -16,7 +16,10 @@
 __docformat__ = 'restructuredtext'
 
 from zope.interface import implementer
-from .interfaces import IFind, IIdFindFilter, IObjectFindFilter
+
+from .interfaces import IFind
+from .interfaces import IIdFindFilter
+from .interfaces import IObjectFindFilter
 from .interfaces import IReadContainer
 
 

src/zope/container/folder.py

@@ -15,7 +15,9 @@
 """
 __docformat__ = 'restructuredtext'
 from zope.interface import implementer
-from zope.container import btree, interfaces
+
+from zope.container import btree
+from zope.container import interfaces
 
 
 @implementer(interfaces.IContentContainer)

src/zope/container/i18n.py

@@ -17,4 +17,6 @@
 
 # import this as _ to create i18n messages in the zope domain
 from zope.i18nmessageid import MessageFactory
+
+
 ZopeMessageFactory = MessageFactory('zope')

src/zope/container/interfaces.py

@@ -15,23 +15,35 @@
 """
 __docformat__ = 'restructuredtext'
 
-from zope.interface import Interface, Invalid
+import zope.deferredimport
+from zope.interface import Interface
+from zope.interface import Invalid
+from zope.interface.common.mapping import IEnumerableMapping
 from zope.interface.common.mapping import IItemMapping
-from zope.interface.common.mapping import IReadMapping, IEnumerableMapping
+from zope.interface.common.mapping import IReadMapping
+from zope.lifecycleevent.interfaces import IObjectModifiedEvent
 from zope.schema import Set
 
-from zope.lifecycleevent.interfaces import IObjectModifiedEvent
+from zope.container.i18n import ZopeMessageFactory as _
 
-# the following imports provide backwards compatibility for consumers;
-# do not remove them
-from zope.lifecycleevent.interfaces import IObjectAddedEvent
-from zope.lifecycleevent.interfaces import IObjectMovedEvent
-from zope.lifecycleevent.interfaces import IObjectRemovedEvent
-from zope.location.interfaces import IContained
-from zope.location.interfaces import ILocation
-# /end backwards compatibility imports
 
-from zope.container.i18n import ZopeMessageFactory as _
+zope.deferredimport.initialize()
+
+
+zope.deferredimport.deprecated(
+    "Some zope.container interfaces have been moved to"
+    " zope.lifecycleevent.interfaces, please import form there.",
+    IObjectAddedEvent='zope.lifecycleevent.interfaces:IObjectAddedEvent',
+    IObjectMovedEvent='zope.lifecycleevent.interfaces:IObjectMovedEvent',
+    IObjectRemovedEvent='zope.lifecycleevent.interfaces:IObjectRemovedEvent',
+)
+
+zope.deferredimport.deprecated(
+    "Some zope.container interfaces have been moved to"
+    " zope.location.interfaces, please import form there.",
+    IContained='zope.location.interfaces:IContained',
+    ILocation='zope.location.interfaces:ILocation',
+)
 
 
 class DuplicateIDError(KeyError):

src/zope/container/ordered.py

@@ -18,11 +18,14 @@
 from persistent import Persistent
 from persistent.dict import PersistentDict
 from persistent.list import PersistentList
-from zope.container.interfaces import IOrderedContainer
 from zope.interface import implementer
-from zope.container.contained import Contained, setitem, uncontained
-from zope.container.contained import notifyContainerModified
+
+from zope.container.contained import Contained
 from zope.container.contained import checkAndConvertName
+from zope.container.contained import notifyContainerModified
+from zope.container.contained import setitem
+from zope.container.contained import uncontained
+from zope.container.interfaces import IOrderedContainer
 
 
 @implementer(IOrderedContainer)

src/zope/container/sample.py

@@ -20,9 +20,12 @@
 """
 __docformat__ = 'restructuredtext'
 
-from zope.container.interfaces import IContainer
 from zope.interface import implementer
-from zope.container.contained import Contained, setitem, uncontained
+
+from zope.container.contained import Contained
+from zope.container.contained import setitem
+from zope.container.contained import uncontained
+from zope.container.interfaces import IContainer
 
 
 @implementer(IContainer)

src/zope/container/size.py

@@ -16,9 +16,10 @@
 """
 __docformat__ = 'restructuredtext'
 
-from zope.container.i18n import ZopeMessageFactory as _
-from zope.size.interfaces import ISized
 from zope.interface import implementer
+from zope.size.interfaces import ISized
+
+from zope.container.i18n import ZopeMessageFactory as _
 
 
 @implementer(ISized)

src/zope/container/testing.py

@@ -17,17 +17,20 @@
 
 import zope.interface
 import zope.traversing.testing
-from zope import component
-from zope.component.testing import PlacelessSetup as CAPlacelessSetup
 from zope.component.eventtesting import PlacelessSetup as EventPlacelessSetup
-from zope.traversing.interfaces import ITraversable, IContainmentRoot
+from zope.component.testing import PlacelessSetup as CAPlacelessSetup
 from zope.testing import renormalizing
+from zope.traversing.interfaces import IContainmentRoot
+from zope.traversing.interfaces import ITraversable
 
-from zope.container.interfaces import IWriteContainer, INameChooser
+from zope import component
 from zope.container.contained import NameChooser
+from zope.container.interfaces import INameChooser
 from zope.container.interfaces import ISimpleReadContainer
-from zope.container.traversal import ContainerTraversable
+from zope.container.interfaces import IWriteContainer
 from zope.container.sample import SampleContainer
+from zope.container.traversal import ContainerTraversable
+
 
 checker = renormalizing.RENormalizing([
     # Python 3 unicode removed the "u".

src/zope/container/tests/constraints_example.py

@@ -1,9 +1,9 @@
 from zope.interface import implementer
 from zope.location.interfaces import IContained
 
-from zope.container.interfaces import IContainer
 from zope.container.constraints import containers
 from zope.container.constraints import contains
+from zope.container.interfaces import IContainer
 
 
 class IBuddyFolder(IContainer):

src/zope/container/tests/test_btree.py

@@ -16,13 +16,13 @@
 import unittest
 
 from zope.interface.verify import verifyObject
+from zope.lifecycleevent.interfaces import IObjectRemovedEvent
 
-from zope.container.tests.test_icontainer import TestSampleContainer
 from zope.container.btree import BTreeContainer
+from zope.container.contained import Contained
 from zope.container.interfaces import IBTreeContainer
 from zope.container.interfaces import IContainerModifiedEvent
-from zope.container.contained import Contained
-from zope.lifecycleevent.interfaces import IObjectRemovedEvent
+from zope.container.tests.test_icontainer import TestSampleContainer
 
 
 class TestBTreeContainer(TestSampleContainer, unittest.TestCase):

src/zope/container/tests/test_constraints.py

@@ -14,6 +14,7 @@
 """Container constraint tests
 """
 import unittest
+
 import six
 
 
@@ -67,6 +68,7 @@ def test_raw_types_property(self):
 
 def test_suite():
     import doctest
+
     from zope.container import testing
     return unittest.TestSuite((
         unittest.defaultTestLoader.loadTestsFromName(__name__),