From eb2e7aeab41cbe3006892cdb7c07e6ded707eba1 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Tue, 30 Aug 2022 09:06:59 +0200 Subject: Isort imports. --- buildout.cfg | 18 ------------- setup.py | 3 ++- src/zope/traversing/adapters.py | 10 ++++--- src/zope/traversing/api.py | 10 +++++-- src/zope/traversing/browser/__init__.py | 2 +- src/zope/traversing/browser/absoluteurl.py | 6 +++-- src/zope/traversing/browser/tests.py | 25 ++++++++++------- src/zope/traversing/interfaces.py | 5 ++-- src/zope/traversing/namespace.py | 4 ++- src/zope/traversing/publicationtraverse.py | 8 +++--- src/zope/traversing/testing.py | 16 +++++++---- .../traversing/tests/test_conveniencefunctions.py | 20 +++++++++----- src/zope/traversing/tests/test_lang.py | 8 +++--- .../traversing/tests/test_namespacetrversal.py | 13 ++++----- src/zope/traversing/tests/test_presentation.py | 14 +++++++--- .../traversing/tests/test_publicationtraverse.py | 12 ++++++--- src/zope/traversing/tests/test_skin.py | 9 ++++--- src/zope/traversing/tests/test_traverser.py | 31 ++++++++++++++-------- src/zope/traversing/tests/test_vh.py | 1 + src/zope/traversing/tests/test_vhosting.py | 17 +++++++----- 20 files changed, 138 insertions(+), 94 deletions(-) delete mode 100644 buildout.cfg diff --git a/buildout.cfg b/buildout.cfg deleted file mode 100644 index 4b18838..0000000 --- a/buildout.cfg +++ /dev/null @@ -1,18 +0,0 @@ -[buildout] -develop = . -parts = test coverage-test coverage-report - -[test] -recipe = zc.recipe.testrunner -eggs = zope.traversing [test] - -[coverage-test] -recipe = zc.recipe.testrunner -eggs = zope.traversing [test] -defaults = ['--coverage', '../../coverage'] - -[coverage-report] -recipe = zc.recipe.egg -eggs = z3c.coverage -scripts = coveragereport=coverage-report -arguments = ('coverage', 'coverage/report') diff --git a/setup.py b/setup.py index c1f6651..9a93bb2 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,8 @@ """Setup for zope.traversing package """ -from setuptools import setup, find_packages +from setuptools import find_packages +from setuptools import setup def read(filename): diff --git a/src/zope/traversing/adapters.py b/src/zope/traversing/adapters.py index 69ad836..f47a5c5 100644 --- a/src/zope/traversing/adapters.py +++ b/src/zope/traversing/adapters.py @@ -16,15 +16,17 @@ Adapters for the traversing mechanism. """ import six + import zope.interface +from zope.location.interfaces import ILocationInfo +from zope.location.interfaces import LocationError +from zope.location.traversing import RootPhysicallyLocatable # BBB -from zope.location.interfaces import ILocationInfo, LocationError -from zope.traversing.interfaces import ITraversable, ITraverser +from zope.traversing.interfaces import ITraversable +from zope.traversing.interfaces import ITraverser from zope.traversing.namespace import namespaceLookup from zope.traversing.namespace import nsParse -from zope.location.traversing import RootPhysicallyLocatable # BBB - _marker = object() # opaque marker that doesn't get security proxied diff --git a/src/zope/traversing/api.py b/src/zope/traversing/api.py index b457e33..71feb3e 100644 --- a/src/zope/traversing/api.py +++ b/src/zope/traversing/api.py @@ -17,9 +17,14 @@ Convenience functions for traversing the object tree. This module provides :class:`zope.traversing.interfaces.ITraversalAPI` """ import six + from zope.interface import moduleProvides -from zope.location.interfaces import ILocationInfo, IRoot -from zope.traversing.interfaces import ITraversalAPI, ITraverser +from zope.location.interfaces import ILocationInfo +from zope.location.interfaces import IRoot + +from zope.traversing.interfaces import ITraversalAPI +from zope.traversing.interfaces import ITraverser + # The authoritative documentation for these functions # is in this interface. Later, we replace all our docstrings @@ -204,6 +209,7 @@ def canonicalPath(path_or_object): # import this down here to avoid circular imports from zope.traversing.adapters import traversePathElement + # Synchronize the documentation. for name in ITraversalAPI.names(): if name in globals(): diff --git a/src/zope/traversing/browser/__init__.py b/src/zope/traversing/browser/__init__.py index 7be0f96..697de06 100644 --- a/src/zope/traversing/browser/__init__.py +++ b/src/zope/traversing/browser/__init__.py @@ -13,6 +13,6 @@ ############################################################################## """Absolute URL View components """ -from zope.traversing.browser.absoluteurl import absoluteURL from zope.traversing.browser.absoluteurl import AbsoluteURL from zope.traversing.browser.absoluteurl import SiteAbsoluteURL +from zope.traversing.browser.absoluteurl import absoluteURL diff --git a/src/zope/traversing/browser/absoluteurl.py b/src/zope/traversing/browser/absoluteurl.py index 285b9de..c083fad 100644 --- a/src/zope/traversing/browser/absoluteurl.py +++ b/src/zope/traversing/browser/absoluteurl.py @@ -28,14 +28,16 @@ try: except ImportError: from urllib import unquote - import zope.component +from zope.i18nmessageid import MessageFactory from zope.interface import implementer from zope.location.interfaces import ILocation from zope.proxy import sameProxiedObjects from zope.publisher.browser import BrowserView + from zope.traversing.browser.interfaces import IAbsoluteURL -from zope.i18nmessageid import MessageFactory + + _ = MessageFactory('zope') _insufficientContext = _("There isn't enough context to get URL information. " diff --git a/src/zope/traversing/browser/tests.py b/src/zope/traversing/browser/tests.py index 51c58dd..a128a9b 100644 --- a/src/zope/traversing/browser/tests.py +++ b/src/zope/traversing/browser/tests.py @@ -16,21 +16,25 @@ import unittest import zope.component -from zope.component import getMultiAdapter, adapter +from zope.component import adapter +from zope.component import getMultiAdapter from zope.component.testing import PlacelessSetup -from zope.traversing.browser.absoluteurl import absoluteURL -from zope.traversing.browser.absoluteurl import AbsoluteURL -from zope.traversing.browser.interfaces import IAbsoluteURL -from zope.traversing.testing import browserView from zope.i18n.interfaces import IUserPreferredCharsets -from zope.interface import Interface, implementer +from zope.interface import Interface +from zope.interface import implementer from zope.interface.verify import verifyObject -from zope.publisher.browser import TestRequest -from zope.publisher.http import IHTTPRequest, HTTPCharsets from zope.location.interfaces import ILocation from zope.location.location import LocationProxy +from zope.publisher.browser import TestRequest +from zope.publisher.http import HTTPCharsets +from zope.publisher.http import IHTTPRequest -from zope.traversing.testing import contained, Contained +from zope.traversing.browser.absoluteurl import AbsoluteURL +from zope.traversing.browser.absoluteurl import absoluteURL +from zope.traversing.browser.interfaces import IAbsoluteURL +from zope.traversing.testing import Contained +from zope.traversing.testing import browserView +from zope.traversing.testing import contained class IRoot(Interface): @@ -78,7 +82,8 @@ class TestAbsoluteURL(PlacelessSetup, unittest.TestCase): def setUp(self): PlacelessSetup.setUp(self) - from zope.traversing.browser import AbsoluteURL, SiteAbsoluteURL + from zope.traversing.browser import AbsoluteURL + from zope.traversing.browser import SiteAbsoluteURL browserView(None, 'absolute_url', AbsoluteURL) browserView(IRoot, 'absolute_url', SiteAbsoluteURL) browserView(None, '', AbsoluteURL, providing=IAbsoluteURL) diff --git a/src/zope/traversing/interfaces.py b/src/zope/traversing/interfaces.py index e707282..a16b0e3 100644 --- a/src/zope/traversing/interfaces.py +++ b/src/zope/traversing/interfaces.py @@ -19,11 +19,10 @@ from zope.interface import Interface from zope.interface import implementer from zope.interface.interfaces import IObjectEvent from zope.interface.interfaces import ObjectEvent - # BBB: Re-import symbols to their old location. -from zope.location.interfaces import LocationError as TraversalError -from zope.location.interfaces import IRoot as IContainmentRoot from zope.location.interfaces import ILocationInfo as IPhysicallyLocatable +from zope.location.interfaces import IRoot as IContainmentRoot +from zope.location.interfaces import LocationError as TraversalError _RAISE_KEYERROR = object() diff --git a/src/zope/traversing/namespace.py b/src/zope/traversing/namespace.py index 72ec258..2ecf2a1 100644 --- a/src/zope/traversing/namespace.py +++ b/src/zope/traversing/namespace.py @@ -64,15 +64,17 @@ __docformat__ = 'restructuredtext' import re import six + import zope.component import zope.interface from zope.i18n.interfaces import IModifiableUserPreferredLanguages -from zope.interface.interfaces import ComponentLookupError from zope.interface import alsoProvides +from zope.interface.interfaces import ComponentLookupError from zope.location.interfaces import LocationError from zope.publisher.interfaces.browser import IBrowserSkinType from zope.publisher.skinnable import applySkin from zope.security.proxy import removeSecurityProxy + from zope.traversing.interfaces import IEtcNamespace from zope.traversing.interfaces import IPathAdapter from zope.traversing.interfaces import ITraversable diff --git a/src/zope/traversing/publicationtraverse.py b/src/zope/traversing/publicationtraverse.py index efa4046..6c03113 100644 --- a/src/zope/traversing/publicationtraverse.py +++ b/src/zope/traversing/publicationtraverse.py @@ -16,14 +16,16 @@ __docformat__ = 'restructuredtext' import six + from zope.component import queryMultiAdapter +from zope.publisher.interfaces import IPublishTraverse from zope.publisher.interfaces import NotFound +from zope.publisher.interfaces.browser import IBrowserPublisher from zope.security.checker import ProxyFactory + +from zope.traversing.interfaces import TraversalError from zope.traversing.namespace import namespaceLookup from zope.traversing.namespace import nsParse -from zope.traversing.interfaces import TraversalError -from zope.publisher.interfaces import IPublishTraverse -from zope.publisher.interfaces.browser import IBrowserPublisher class PublicationTraverser(object): diff --git a/src/zope/traversing/testing.py b/src/zope/traversing/testing.py index 177b76d..bdec349 100644 --- a/src/zope/traversing/testing.py +++ b/src/zope/traversing/testing.py @@ -17,17 +17,23 @@ __docformat__ = "reStructuredText" import zope.component import zope.interface +from zope.location.interfaces import IContained +from zope.location.interfaces import ILocationInfo +from zope.location.interfaces import IRoot +from zope.location.traversing import LocationPhysicallyLocatable +from zope.location.traversing import RootPhysicallyLocatable from zope.publisher.interfaces.browser import IDefaultBrowserLayer -from zope.location.traversing \ - import LocationPhysicallyLocatable, RootPhysicallyLocatable -from zope.location.interfaces import IContained, ILocationInfo, IRoot -from zope.traversing.interfaces import ITraversable, ITraverser + from zope.traversing.adapters import DefaultTraversable from zope.traversing.adapters import Traverser -from zope.traversing.browser import SiteAbsoluteURL, AbsoluteURL +from zope.traversing.browser import AbsoluteURL +from zope.traversing.browser import SiteAbsoluteURL from zope.traversing.browser.interfaces import IAbsoluteURL +from zope.traversing.interfaces import ITraversable +from zope.traversing.interfaces import ITraverser from zope.traversing.namespace import etc + @zope.interface.implementer(IContained) class Contained(object): __parent__ = None diff --git a/src/zope/traversing/tests/test_conveniencefunctions.py b/src/zope/traversing/tests/test_conveniencefunctions.py index c0b9b6d..a42c3f3 100644 --- a/src/zope/traversing/tests/test_conveniencefunctions.py +++ b/src/zope/traversing/tests/test_conveniencefunctions.py @@ -15,17 +15,22 @@ """ import unittest -from zope import interface import zope.component from zope.component.testing import PlacelessSetup -from zope.location.traversing \ - import LocationPhysicallyLocatable, RootPhysicallyLocatable -from zope.location.interfaces import ILocationInfo, IRoot, LocationError +from zope.location.interfaces import ILocationInfo +from zope.location.interfaces import IRoot +from zope.location.interfaces import LocationError +from zope.location.traversing import LocationPhysicallyLocatable +from zope.location.traversing import RootPhysicallyLocatable -from zope.traversing.adapters import Traverser, DefaultTraversable -from zope.traversing.interfaces import ITraversable, ITraverser +from zope import interface +from zope.traversing.adapters import DefaultTraversable +from zope.traversing.adapters import Traverser +from zope.traversing.interfaces import ITraversable +from zope.traversing.interfaces import ITraverser from zope.traversing.testing import contained + class C(object): __parent__ = None __name__ = None @@ -131,9 +136,10 @@ class TestFunctional(PlacelessSetup, unittest.TestCase): ) def testTraverseNameUnicode(self): - from zope.traversing.api import traverseName from zope.interface import implementer + from zope.traversing.api import traverseName + @implementer(ITraversable) class BrokenTraversable(object): def traverse(self, name, furtherPath): diff --git a/src/zope/traversing/tests/test_lang.py b/src/zope/traversing/tests/test_lang.py index d6f9ff8..23a53f8 100644 --- a/src/zope/traversing/tests/test_lang.py +++ b/src/zope/traversing/tests/test_lang.py @@ -16,16 +16,18 @@ import unittest import zope.component -from zope.annotation import IAttributeAnnotatable, IAnnotations +from zope.annotation import IAnnotations +from zope.annotation import IAttributeAnnotatable from zope.annotation.attribute import AttributeAnnotations +from zope.i18n.interfaces import IModifiableUserPreferredLanguages from zope.interface import directlyProvides from zope.publisher.browser import ModifiableBrowserLanguages from zope.publisher.interfaces.http import IHTTPRequest from zope.publisher.tests import test_browserlanguages -from zope.i18n.interfaces import IModifiableUserPreferredLanguages -from zope.traversing.namespace import lang from zope.testing.cleanup import CleanUp +from zope.traversing.namespace import lang + class TestRequest(test_browserlanguages.TestRequest): diff --git a/src/zope/traversing/tests/test_namespacetrversal.py b/src/zope/traversing/tests/test_namespacetrversal.py index 5f91195..bde1aeb 100644 --- a/src/zope/traversing/tests/test_namespacetrversal.py +++ b/src/zope/traversing/tests/test_namespacetrversal.py @@ -17,15 +17,16 @@ import re import unittest from doctest import DocTestSuite -from zope import interface -from zope import component -from zope.location.interfaces import LocationError -from zope.traversing import namespace - from zope.component.testing import PlacelessSetup -from zope.component.testing import setUp, tearDown +from zope.component.testing import setUp +from zope.component.testing import tearDown +from zope.location.interfaces import LocationError from zope.testing.renormalizing import RENormalizing +from zope import component +from zope import interface +from zope.traversing import namespace + class TestSimpleHandler(unittest.TestCase): diff --git a/src/zope/traversing/tests/test_presentation.py b/src/zope/traversing/tests/test_presentation.py index 6299ddc..10a9039 100644 --- a/src/zope/traversing/tests/test_presentation.py +++ b/src/zope/traversing/tests/test_presentation.py @@ -14,11 +14,17 @@ """Presentation Traverser Tests """ import unittest -from zope.testing.cleanup import CleanUp -from zope.interface import Interface, implementer + +from zope.interface import Interface +from zope.interface import implementer from zope.publisher.browser import TestRequest -from zope.traversing.namespace import view, resource -from zope.traversing.testing import browserView, browserResource +from zope.testing.cleanup import CleanUp + +from zope.traversing.namespace import resource +from zope.traversing.namespace import view +from zope.traversing.testing import browserResource +from zope.traversing.testing import browserView + class IContent(Interface): pass diff --git a/src/zope/traversing/tests/test_publicationtraverse.py b/src/zope/traversing/tests/test_publicationtraverse.py index bd5386f..086177e 100644 --- a/src/zope/traversing/tests/test_publicationtraverse.py +++ b/src/zope/traversing/tests/test_publicationtraverse.py @@ -15,17 +15,20 @@ """ import unittest -from zope.testing.cleanup import CleanUp from zope.component import provideAdapter -from zope.interface import Interface, implementer +from zope.interface import Interface +from zope.interface import implementer from zope.publisher.browser import TestRequest from zope.publisher.interfaces import IPublishTraverse from zope.publisher.interfaces import NotFound from zope.publisher.interfaces.browser import IBrowserPublisher from zope.security.proxy import removeSecurityProxy +from zope.testing.cleanup import CleanUp + from zope.traversing.interfaces import ITraversable from zope.traversing.publicationtraverse import PublicationTraverser + class TestPublicationTraverser(CleanUp, unittest.TestCase): def testViewNotFound(self): @@ -193,10 +196,11 @@ class TestPublicationTraverser(CleanUp, unittest.TestCase): class TestBeforeTraverseEvent(unittest.TestCase): def test_interfaces(self): - from zope.traversing.interfaces import IBeforeTraverseEvent - from zope.traversing.interfaces import BeforeTraverseEvent from zope.interface.verify import verifyObject + from zope.traversing.interfaces import BeforeTraverseEvent + from zope.traversing.interfaces import IBeforeTraverseEvent + request = object() target = object() ob = BeforeTraverseEvent(target, request) diff --git a/src/zope/traversing/tests/test_skin.py b/src/zope/traversing/tests/test_skin.py index 0a12825..bd2c4d1 100644 --- a/src/zope/traversing/tests/test_skin.py +++ b/src/zope/traversing/tests/test_skin.py @@ -16,9 +16,11 @@ import unittest import zope.component -from zope.testing.cleanup import CleanUp -from zope.interface import Interface, directlyProvides +from zope.interface import Interface +from zope.interface import directlyProvides from zope.publisher.interfaces.browser import IBrowserSkinType +from zope.testing.cleanup import CleanUp + class FauxRequest(object): def shiftNameToApplication(self): @@ -46,8 +48,9 @@ class Test(CleanUp, unittest.TestCase): self.assertEqual(request.shifted, 1) def test_missing_skin(self): - from zope.traversing.namespace import skin from zope.location.interfaces import LocationError + + from zope.traversing.namespace import skin request = FauxRequest() ob = object() traverser = skin(ob, request) diff --git a/src/zope/traversing/tests/test_traverser.py b/src/zope/traversing/tests/test_traverser.py index 9eeb211..492cccd 100644 --- a/src/zope/traversing/tests/test_traverser.py +++ b/src/zope/traversing/tests/test_traverser.py @@ -17,21 +17,30 @@ import unittest import zope.component from zope.component.testing import PlacelessSetup -from zope.interface import directlyProvides, implementedBy +from zope.interface import directlyProvides +from zope.interface import implementedBy from zope.interface.verify import verifyClass -from zope.location.traversing \ - import LocationPhysicallyLocatable, RootPhysicallyLocatable -from zope.location.interfaces \ - import ILocationInfo, IRoot, LocationError +from zope.location.interfaces import ILocationInfo +from zope.location.interfaces import IRoot +from zope.location.interfaces import LocationError +from zope.location.traversing import LocationPhysicallyLocatable +from zope.location.traversing import RootPhysicallyLocatable +from zope.security.checker import Checker +from zope.security.checker import CheckerPublic +from zope.security.checker import ProxyFactory +from zope.security.checker import defineChecker from zope.security.interfaces import Unauthorized -from zope.security.checker \ - import ProxyFactory, defineChecker, CheckerPublic, Checker -from zope.security.management import newInteraction, endInteraction +from zope.security.management import endInteraction +from zope.security.management import newInteraction -from zope.traversing.adapters import Traverser, DefaultTraversable from zope.traversing import adapters -from zope.traversing.interfaces import ITraversable, ITraverser -from zope.traversing.testing import contained, Contained +from zope.traversing.adapters import DefaultTraversable +from zope.traversing.adapters import Traverser +from zope.traversing.interfaces import ITraversable +from zope.traversing.interfaces import ITraverser +from zope.traversing.testing import Contained +from zope.traversing.testing import contained + class ParticipationStub(object): diff --git a/src/zope/traversing/tests/test_vh.py b/src/zope/traversing/tests/test_vh.py index 7a0a809..70d88ec 100644 --- a/src/zope/traversing/tests/test_vh.py +++ b/src/zope/traversing/tests/test_vh.py @@ -15,6 +15,7 @@ """ import unittest + class TestRequest(object): def __init__(self, names=None, stack=None): diff --git a/src/zope/traversing/tests/test_vhosting.py b/src/zope/traversing/tests/test_vhosting.py index ed393e6..137a997 100644 --- a/src/zope/traversing/tests/test_vhosting.py +++ b/src/zope/traversing/tests/test_vhosting.py @@ -18,26 +18,30 @@ import unittest from io import StringIO import transaction - import zope.component import zope.interface from zope.browserresource.resource import Resource from zope.configuration import xmlconfig from zope.location.interfaces import IRoot -from zope.publisher.browser import BrowserRequest, BrowserView +from zope.publisher.browser import BrowserRequest +from zope.publisher.browser import BrowserView from zope.publisher.interfaces import NotFound from zope.publisher.interfaces.browser import IBrowserPublisher from zope.publisher.publish import publish from zope.publisher.skinnable import setDefaultSkin -from zope.security.checker import defineChecker, NamesChecker, NoProxy -from zope.security.checker import _checkers, undefineChecker +from zope.security.checker import NamesChecker +from zope.security.checker import NoProxy +from zope.security.checker import _checkers +from zope.security.checker import defineChecker +from zope.security.checker import undefineChecker from zope.tales import expressions from zope.tales.tales import ExpressionEngine from zope.testing.cleanup import cleanUp from zope.traversing.adapters import traversePathElement from zope.traversing.api import traverse -from zope.traversing.testing import browserResource, Contained +from zope.traversing.testing import Contained +from zope.traversing.testing import browserResource class MyObj(Contained): @@ -302,7 +306,8 @@ class DummyPublication(object): view = getMultiAdapter((ob, request), name=name) return view - from zope.traversing.publicationtraverse import PublicationTraverserWithoutProxy + from zope.traversing.publicationtraverse import \ + PublicationTraverserWithoutProxy t = PublicationTraverserWithoutProxy() return t.traverseName(request, ob, name) -- cgit v1.2.1