Isort and autopep8 the code.

12 files changed, 101 insertions, 38 deletions

diff --git a/setup.py b/setup.py
index 8e30d28..1f4fda8 100644
--- a/setup.py
+++ b/setup.py
@@ -19,12 +19,16 @@
 """Setup for zope.location package
 """
 import os
-from setuptools import setup, find_packages
+
+from setuptools import find_packages
+from setuptools import setup
+
 
 def read(*rnames):
     with open(os.path.join(os.path.dirname(__file__), *rnames)) as f:
         return f.read()
 
+
 ZCML_REQUIRES = [
     'zope.configuration',
 ]
@@ -41,7 +45,7 @@ TESTS_REQUIRE = ZCML_REQUIRES + COMPONENT_REQUIRES + [
 DOCS_REQUIRE = [
     'Sphinx',
     'repoze.sphinx.autointerface',
-] + ZCML_REQUIRES + COMPONENT_REQUIRES # doctest snippets need these
+] + ZCML_REQUIRES + COMPONENT_REQUIRES  # doctest snippets need these
 
 setup(name='zope.location',
       version='4.3.dev0',
@@ -81,7 +85,7 @@ setup(name='zope.location',
       url='http://github.com/zopefoundation/zope.location/',
       packages=find_packages('src'),
       package_dir={'': 'src'},
-      namespace_packages=['zope',],
+      namespace_packages=['zope', ],
       install_requires=[
           'setuptools',
           'zope.interface>=4.0.2',
@@ -97,4 +101,4 @@ setup(name='zope.location',
       test_suite='zope.location.tests',
       include_package_data=True,
       zip_safe=False,
-)
+      )
diff --git a/src/zope/__init__.py b/src/zope/__init__.py
index 2cdb0e4..656dc0f 100644
--- a/src/zope/__init__.py
+++ b/src/zope/__init__.py
@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__) # pragma: no cover
+__import__('pkg_resources').declare_namespace(__name__)  # pragma: no cover
diff --git a/src/zope/location/__init__.py b/src/zope/location/__init__.py
index 104c1ac..ca0e267 100644
--- a/src/zope/location/__init__.py
+++ b/src/zope/location/__init__.py
@@ -16,5 +16,8 @@
 __docformat__ = 'restructuredtext'
 
 from zope.location.interfaces import ILocation
-from zope.location.location import Location, locate, LocationIterator
-from zope.location.location import inside, LocationProxy
+from zope.location.location import Location
+from zope.location.location import LocationIterator
+from zope.location.location import LocationProxy
+from zope.location.location import inside
+from zope.location.location import locate
diff --git a/src/zope/location/interfaces.py b/src/zope/location/interfaces.py
index b490a09..c706934 100644
--- a/src/zope/location/interfaces.py
+++ b/src/zope/location/interfaces.py
@@ -15,8 +15,8 @@
 """
 __docformat__ = 'restructuredtext'
 
-from zope.interface import Interface
 from zope.interface import Attribute
+from zope.interface import Interface
 from zope.schema import TextLine
 
 
@@ -52,9 +52,11 @@ class ILocation(Interface):
 # used within this package, but is depended upon by external
 # consumers.
 
+
 class IContained(ILocation):
     """Objects contained in containers."""
 
+
 class ILocationInfo(Interface):
     """Provides supplemental information for located objects.
 
@@ -121,12 +123,13 @@ class IRoot(Interface):
 class LocationError(KeyError, LookupError):
     """There is no object for a given location."""
 
+
 # Soft dependency on zope.component.
 #
 # Also, these interfaces used to be defined here directly, so this provides
 # backward-compatibility
 try:
     from zope.component.interfaces import ISite
-except ImportError: # pragma: no cover
+except ImportError:  # pragma: no cover
     class ISite(Interface):
         pass
diff --git a/src/zope/location/location.py b/src/zope/location/location.py
index 3554c51..857ad6f 100644
--- a/src/zope/location/location.py
+++ b/src/zope/location/location.py
@@ -23,6 +23,7 @@ from zope.proxy.decorator import DecoratorSpecificationDescriptor
 
 from zope.location.interfaces import ILocation
 
+
 @implementer(ILocation)
 class Location(object):
     """Mix-in that implements ILocation.
@@ -70,6 +71,7 @@ def inside(l1, l2):
         l1 = getattr(l1, '__parent__', None)
     return False
 
+
 class ClassAndInstanceDescr(object):
 
     def __init__(self, *args):
@@ -93,8 +95,8 @@ class LocationProxy(ProxyBase):
 
     __doc__ = ClassAndInstanceDescr(
         lambda inst: getProxiedObject(inst).__doc__,
-        lambda cls, __doc__ = __doc__: __doc__,
-        )
+        lambda cls, __doc__=__doc__: __doc__,
+    )
 
     def __new__(self, ob, container=None, name=None):
         return ProxyBase.__new__(self, ob)
@@ -111,10 +113,10 @@ class LocationProxy(ProxyBase):
 
     def __setattr__(self, name, value):
         if name in self.__slots__ + getattr(ProxyBase, '__slots__', ()):
-            #('_wrapped', '__parent__', '__name__'):
+            # ('_wrapped', '__parent__', '__name__'):
             try:
                 return object.__setattr__(self, name, value)
-            except TypeError: #pragma NO COVER C Optimization
+            except TypeError:  # pragma NO COVER C Optimization
                 return ProxyBase.__setattr__(self, name, value)
         return ProxyBase.__setattr__(self, name, value)
 
diff --git a/src/zope/location/pickling.py b/src/zope/location/pickling.py
index 46e6217..47181eb 100644
--- a/src/zope/location/pickling.py
+++ b/src/zope/location/pickling.py
@@ -16,11 +16,14 @@
 __docformat__ = 'restructuredtext'
 
 from zope.interface import implementer
+
 from zope.location.location import inside
 
+
 try:
-    from zope.copy.interfaces import ICopyHook, ResumeCopy
-except ImportError: # pragma: no cover
+    from zope.copy.interfaces import ICopyHook
+    from zope.copy.interfaces import ResumeCopy
+except ImportError:  # pragma: no cover
     raise NotImplementedError("zope.location.pickling is not supported "
                               "because zope.copy is not available")
 
@@ -30,6 +33,7 @@ class LocationCopyHook(object):
     """Copy hook to preserve copying referenced objects that are not
     located inside object that's being copied.
     """
+
     def __init__(self, context):
         self.context = context
 
diff --git a/src/zope/location/tests/__init__.py b/src/zope/location/tests/__init__.py
index d3173e6..5bb534f 100644
--- a/src/zope/location/tests/__init__.py
+++ b/src/zope/location/tests/__init__.py
@@ -1 +1 @@
-#package
+# package
diff --git a/src/zope/location/tests/test_configure.py b/src/zope/location/tests/test_configure.py
index ec31efb..332faa5 100644
--- a/src/zope/location/tests/test_configure.py
+++ b/src/zope/location/tests/test_configure.py
@@ -15,14 +15,16 @@
 """
 import unittest
 
+
 class Test_ZCML_loads(unittest.TestCase):
 
     def test_it(self):
-        import zope.component # no registrations made if not present
+        import zope.component  # no registrations made if not present
         ADAPTERS_REGISTERED = 4
+        from zope.configuration.xmlconfig import XMLConfig
         from zope.configuration.xmlconfig import _clearContext
         from zope.configuration.xmlconfig import _getContext
-        from zope.configuration.xmlconfig import XMLConfig
+
         import zope.location
 
         _clearContext()
diff --git a/src/zope/location/tests/test_location.py b/src/zope/location/tests/test_location.py
index ea60099..635a2d9 100644
--- a/src/zope/location/tests/test_location.py
+++ b/src/zope/location/tests/test_location.py
@@ -18,11 +18,13 @@ class ConformsToILocation(object):
 
     def test_class_conforms_to_ILocation(self):
         from zope.interface.verify import verifyClass
+
         from zope.location.interfaces import ILocation
         verifyClass(ILocation, self._getTargetClass())
 
     def test_instance_conforms_to_ILocation(self):
         from zope.interface.verify import verifyObject
+
         from zope.location.interfaces import ILocation
         verifyObject(ILocation, self._makeOne())
 
@@ -75,7 +77,9 @@ class Test_located(unittest.TestCase):
 
     def test_wo_name_obj_implements_ILocation(self):
         from zope.interface import implementer
+
         from zope.location.interfaces import ILocation
+
         @implementer(ILocation)
         class Dummy(object):
             __parent__ = None
@@ -88,11 +92,14 @@ class Test_located(unittest.TestCase):
 
     def test_w_name_adaptable_to_ILocation(self):
         from zope.interface.interface import adapter_hooks
+
         from zope.location.interfaces import ILocation
         _hooked = []
+
         def _hook(iface, obj):
             _hooked.append((iface, obj))
             return obj
+
         class Dummy(object):
             pass
         parent = Dummy()
@@ -206,13 +213,16 @@ class ClassAndInstanceDescrTests(unittest.TestCase):
 
     def _makeScaffold(self):
         _inst_called = []
+
         def _inst(*args, **kw):
             _inst_called.append((args, kw))
             return 'INST'
         _class_called = []
+
         def _class(*args, **kw):
             _class_called.append((args, kw))
             return 'CLASS'
+
         class Foo(object):
             descr = self._makeOne(_inst, _class)
         return Foo, _class_called, _inst_called
@@ -220,7 +230,7 @@ class ClassAndInstanceDescrTests(unittest.TestCase):
     def test_fetched_from_class(self):
         Foo, _class_called, _inst_called = self._makeScaffold()
         self.assertEqual(Foo.descr, 'CLASS')
-        self.assertEqual(_class_called, [((Foo,),{})])
+        self.assertEqual(_class_called, [((Foo,), {})])
         self.assertEqual(_inst_called, [])
 
     def test_fetched_from_instance(self):
@@ -228,7 +238,7 @@ class ClassAndInstanceDescrTests(unittest.TestCase):
         foo = Foo()
         self.assertEqual(foo.descr, 'INST')
         self.assertEqual(_class_called, [])
-        self.assertEqual(_inst_called, [((foo,),{})])
+        self.assertEqual(_inst_called, [((foo,), {})])
 
 
 _MARKER = object()
@@ -250,13 +260,13 @@ class LocationProxyTests(unittest.TestCase, ConformsToILocation):
         return self._getTargetClass()(obj, container, name)
 
     def test_ctor_defaults(self):
-        dummy = object() # can't setattr
+        dummy = object()  # can't setattr
         proxy = self._makeOne(dummy)
         self.assertEqual(proxy.__parent__, None)
         self.assertEqual(proxy.__name__, None)
 
     def test_ctor_explicit(self):
-        dummy = object() # can't setattr
+        dummy = object()  # can't setattr
         parent = object()
         proxy = self._makeOne(dummy, parent, 'name')
         self.assertTrue(proxy.__parent__ is parent)
@@ -279,19 +289,18 @@ class LocationProxyTests(unittest.TestCase, ConformsToILocation):
 
     def test___doc___from_derived_class(self):
         klass = self._getTargetClass()
+
         class Derived(klass):
             """DERIVED"""
         self.assertEqual(Derived.__doc__, 'DERIVED')
 
     def test___doc___from_target_class(self):
-        klass = self._getTargetClass()
         class Context(object):
             """CONTEXT"""
         proxy = self._makeOne(Context())
         self.assertEqual(proxy.__doc__, 'CONTEXT')
 
     def test___doc___from_target_instance(self):
-        klass = self._getTargetClass()
         class Context(object):
             """CONTEXT"""
         context = Context()
@@ -309,6 +318,7 @@ class LocationProxyTests(unittest.TestCase, ConformsToILocation):
 
     def test___reduce___via_pickling(self):
         import pickle
+
         class Context(object):
             def __reduce__(self):
                 raise AssertionError("This is not called")
@@ -323,10 +333,13 @@ class LocationProxyTests(unittest.TestCase, ConformsToILocation):
         from zope.interface import implementer
         from zope.interface import providedBy
         from zope.interface import provider
+
         class IProxyFactory(Interface):
             pass
+
         class IProxy(Interface):
             pass
+
         @provider(IProxyFactory)
         @implementer(IProxy)
         class Foo(self._getTargetClass()):
@@ -338,26 +351,34 @@ class LocationProxyTests(unittest.TestCase, ConformsToILocation):
         from zope.interface import implementer
         from zope.interface import providedBy
         from zope.interface import provider
+
         from zope.location.interfaces import ILocation
+
         class IProxyFactory(Interface):
             pass
+
         class IProxy(Interface):
             pass
+
         class IContextFactory(Interface):
             pass
+
         class IContext(Interface):
             pass
+
         @provider(IProxyFactory)
         @implementer(IProxy)
         class Proxy(self._getTargetClass()):
             pass
+
         @provider(IContextFactory)
         @implementer(IContext)
         class Context(object):
             pass
         context = Context()
         proxy = Proxy(context)
-        self.assertEqual(list(providedBy(proxy)), [IContext, IProxy, ILocation])
+        self.assertEqual(list(providedBy(proxy)), [
+                         IContext, IProxy, ILocation])
 
 
 class LocationPyProxyTests(LocationProxyTests):
@@ -368,7 +389,7 @@ class LocationPyProxyTests(LocationProxyTests):
                     'zope.proxy.decorator'):
             try:
                 del sys.modules[mod]
-            except KeyError: # pragma: no cover
+            except KeyError:  # pragma: no cover
                 pass
         import zope.proxy
         self.orig = (zope.proxy.ProxyBase,
@@ -390,7 +411,6 @@ class LocationPyProxyTests(LocationProxyTests):
         zope.proxy.removeAllProxies = zope.proxy.py_removeAllProxies
         zope.proxy.non_overridable = zope.proxy.PyNonOverridable
 
-
     def tearDown(self):
         import zope.proxy
         (zope.proxy.ProxyBase,
diff --git a/src/zope/location/tests/test_pickling.py b/src/zope/location/tests/test_pickling.py
index 063c9f6..bd1923a 100644
--- a/src/zope/location/tests/test_pickling.py
+++ b/src/zope/location/tests/test_pickling.py
@@ -14,8 +14,6 @@
 import unittest
 
 
-import zope.copy
-
 class LocationCopyHookTests(unittest.TestCase):
 
     def _getTargetClass(self):
@@ -28,17 +26,18 @@ class LocationCopyHookTests(unittest.TestCase):
         return self._getTargetClass()(obj)
 
     def test_class_conforms_to_ICopyHook(self):
-        from zope.interface.verify import verifyClass
         from zope.copy.interfaces import ICopyHook
+        from zope.interface.verify import verifyClass
         verifyClass(ICopyHook, self._getTargetClass())
 
     def test_instance_conforms_to_ICopyHook(self):
-        from zope.interface.verify import verifyObject
         from zope.copy.interfaces import ICopyHook
+        from zope.interface.verify import verifyObject
         verifyObject(ICopyHook, self._makeOne())
 
     def test___call___w_context_inside_toplevel(self):
         from zope.copy.interfaces import ResumeCopy
+
         class Dummy(object):
             __parent__ = __name__ = None
         top_level = Dummy()
@@ -56,6 +55,5 @@ class LocationCopyHookTests(unittest.TestCase):
         self.assertTrue(hook(top_level, object()) is context)
 
 
-
 def test_suite():
     return unittest.defaultTestLoader.loadTestsFromName(__name__)
diff --git a/src/zope/location/tests/test_traversing.py b/src/zope/location/tests/test_traversing.py
index ed82e4b..f4505be 100644
--- a/src/zope/location/tests/test_traversing.py
+++ b/src/zope/location/tests/test_traversing.py
@@ -18,17 +18,19 @@ class ConformsToILocationInfo(object):
 
     def test_class_conforms_to_ILocationInfo(self):
         from zope.interface.verify import verifyClass
+
         from zope.location.interfaces import ILocationInfo
         verifyClass(ILocationInfo, self._getTargetClass())
 
     def test_instance_conforms_to_ILocationInfo(self):
         from zope.interface.verify import verifyObject
+
         from zope.location.interfaces import ILocationInfo
         verifyObject(ILocationInfo, self._makeOne())
 
 
 class LocationPhysicallyLocatableTests(
-                    unittest.TestCase, ConformsToILocationInfo):
+        unittest.TestCase, ConformsToILocationInfo):
 
     def _getTargetClass(self):
         from zope.location.traversing import LocationPhysicallyLocatable
@@ -51,7 +53,9 @@ class LocationPhysicallyLocatableTests(
 
     def test_getRoot_wo_cycle(self):
         from zope.interface import directlyProvides
+
         from zope.location.interfaces import IRoot
+
         class Dummy(object):
             __parent__ = None
         one = Dummy()
@@ -87,7 +91,9 @@ class LocationPhysicallyLocatableTests(
 
     def test_getPath_at_root(self):
         from zope.interface import directlyProvides
+
         from zope.location.interfaces import IRoot
+
         class Dummy(object):
             __parent__ = __name__ = None
         one = Dummy()
@@ -97,7 +103,9 @@ class LocationPhysicallyLocatableTests(
 
     def test_getPath_wo_cycle(self):
         from zope.interface import directlyProvides
+
         from zope.location.interfaces import IRoot
+
         class Dummy(object):
             __parent__ = __name__ = None
         one = Dummy()
@@ -137,7 +145,9 @@ class LocationPhysicallyLocatableTests(
 
     def test_getParent_at_root(self):
         from zope.interface import directlyProvides
+
         from zope.location.interfaces import IRoot
+
         class Dummy(object):
             __parent__ = __name__ = None
         one = Dummy()
@@ -147,7 +157,9 @@ class LocationPhysicallyLocatableTests(
 
     def test_getParent_wo_cycle(self):
         from zope.interface import directlyProvides
+
         from zope.location.interfaces import IRoot
+
         class Dummy(object):
             __parent__ = __name__ = None
         one = Dummy()
@@ -173,7 +185,9 @@ class LocationPhysicallyLocatableTests(
 
     def test_getParents_at_root(self):
         from zope.interface import directlyProvides
+
         from zope.location.interfaces import IRoot
+
         class Dummy(object):
             __parent__ = __name__ = None
         one = Dummy()
@@ -183,7 +197,9 @@ class LocationPhysicallyLocatableTests(
 
     def test_getParents_wo_cycle(self):
         from zope.interface import directlyProvides
+
         from zope.location.interfaces import IRoot
+
         class Dummy(object):
             __parent__ = __name__ = None
         one = Dummy()
@@ -214,8 +230,11 @@ class LocationPhysicallyLocatableTests(
         self.assertEqual(proxy.getName(), 'name')
 
     def test_getNearestSite_context_is_site(self):
-        from zope.location.interfaces import ISite # zope.component, if present
         from zope.interface import directlyProvides
+
+        from zope.location.interfaces import \
+            ISite  # zope.component, if present
+
         class Dummy(object):
             pass
         context = Dummy()
@@ -224,9 +243,12 @@ class LocationPhysicallyLocatableTests(
         self.assertTrue(proxy.getNearestSite() is context)
 
     def test_getNearestSite_ancestor_is_site(self):
-        from zope.location.interfaces import ISite # zope.component, if present
         from zope.interface import directlyProvides
+
         from zope.location.interfaces import IRoot
+        from zope.location.interfaces import \
+            ISite  # zope.component, if present
+
         class Dummy(object):
             pass
         one = Dummy()
@@ -242,7 +264,9 @@ class LocationPhysicallyLocatableTests(
 
     def test_getNearestSite_no_site(self):
         from zope.interface import directlyProvides
+
         from zope.location.interfaces import IRoot
+
         class Dummy(object):
             __parent__ = __name__ = None
         one = Dummy()
@@ -258,7 +282,7 @@ class LocationPhysicallyLocatableTests(
 
 
 class RootPhysicallyLocatableTests(
-                    unittest.TestCase, ConformsToILocationInfo):
+        unittest.TestCase, ConformsToILocationInfo):
 
     def _getTargetClass(self):
         from zope.location.traversing import RootPhysicallyLocatable
diff --git a/src/zope/location/traversing.py b/src/zope/location/traversing.py
index 2e6836c..0b49c9d 100644
--- a/src/zope/location/traversing.py
+++ b/src/zope/location/traversing.py
@@ -19,13 +19,14 @@ from zope.interface import implementer
 
 from zope.location.interfaces import ILocationInfo
 from zope.location.interfaces import IRoot
-from zope.location.interfaces import ISite # zope.component, if present
+from zope.location.interfaces import ISite  # zope.component, if present
 
 
 @implementer(ILocationInfo)
 class LocationPhysicallyLocatable(object):
     """Provide location information for location objects
     """
+
     def __init__(self, context):
         self.context = context
 
@@ -84,7 +85,7 @@ class LocationPhysicallyLocatable(object):
         # from zope.traversing.
         parents = []
         w = self.context
-        while 1:
+        while True:
             w = getattr(w, '__parent__', None)
             if w is None:
                 break
@@ -110,6 +111,7 @@ class LocationPhysicallyLocatable(object):
                 return parent
         return self.getRoot()
 
+
 @implementer(ILocationInfo)
 class RootPhysicallyLocatable(object):
     """Provide location information for the root object
@@ -118,6 +120,7 @@ class RootPhysicallyLocatable(object):
     for parents and nearest sites, so we are only working with context
     object, knowing that its the root object already.
     """
+
     def __init__(self, context):
         self.context = context