Skip to content

Commit

Permalink
- apply isort config
Browse files Browse the repository at this point in the history
  • Loading branch information
dataflake committed Oct 30, 2020
1 parent f889ffe commit 0035f4c
Show file tree
Hide file tree
Showing 38 changed files with 107 additions and 64 deletions.
3 changes: 2 additions & 1 deletion Products/CMFCore/CMFBTreeFolder.py
Expand Up @@ -15,9 +15,10 @@

from AccessControl.class_init import InitializeClass
from AccessControl.SecurityInfo import ClassSecurityInfo
from Products.BTreeFolder2.BTreeFolder2 import BTreeFolder2Base
from zope.component.factory import Factory

from Products.BTreeFolder2.BTreeFolder2 import BTreeFolder2Base

from .permissions import AddPortalFolders
from .PortalFolder import PortalFolder
from .PortalFolder import PortalFolderBase
Expand Down
5 changes: 3 additions & 2 deletions Products/CMFCore/CatalogTool.py
Expand Up @@ -22,8 +22,6 @@
from Acquisition import aq_base
from App.special_dtml import DTMLFile
from DateTime.DateTime import DateTime
from Products.PluginIndexes.util import safe_callable
from Products.ZCatalog.ZCatalog import ZCatalog
from zope.component import adapts
from zope.component import queryMultiAdapter
from zope.component import queryUtility
Expand All @@ -33,6 +31,9 @@
from zope.interface.declarations import ObjectSpecificationDescriptor
from zope.interface.declarations import getObjectSpecification

from Products.PluginIndexes.util import safe_callable
from Products.ZCatalog.ZCatalog import ZCatalog

from .ActionProviderBase import ActionProviderBase
from .indexing import filterTemporaryItems
from .indexing import getQueue
Expand Down
3 changes: 2 additions & 1 deletion Products/CMFCore/FSObject.py
Expand Up @@ -28,9 +28,10 @@
from OFS.Cache import Cacheable
from OFS.role import RoleManager
from OFS.SimpleItem import Item
from Products.PythonScripts.standard import html_quote
from zope.component import getUtility

from Products.PythonScripts.standard import html_quote

from .interfaces import ISkinsTool
from .permissions import ManagePortal
from .permissions import View
Expand Down
3 changes: 2 additions & 1 deletion Products/CMFCore/FSPythonScript.py
Expand Up @@ -22,9 +22,10 @@
from App.special_dtml import DTMLFile
from ComputedAttribute import ComputedAttribute
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from Products.PythonScripts.PythonScript import PythonScript
from Shared.DC.Scripts.Script import Script

from Products.PythonScripts.PythonScript import PythonScript

from .DirectoryView import registerFileExtension
from .DirectoryView import registerMetaType
from .FSObject import FSObject
Expand Down
1 change: 1 addition & 0 deletions Products/CMFCore/FSZSQLMethod.py
Expand Up @@ -20,6 +20,7 @@
from Acquisition import ImplicitAcquisitionWrapper
from App.config import getConfiguration
from App.special_dtml import DTMLFile

from Products.ZSQLMethods.SQL import SQL

from .DirectoryView import registerFileExtension
Expand Down
3 changes: 2 additions & 1 deletion Products/CMFCore/SkinsTool.py
Expand Up @@ -26,11 +26,12 @@
from OFS.ObjectManager import REPLACEABLE
from Persistence import PersistentMapping
from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
from Products.PythonScripts.PythonScript import PythonScript
from zope.component import getUtility
from zope.globalrequest import getRequest
from zope.interface import implementer

from Products.PythonScripts.PythonScript import PythonScript

from .ActionProviderBase import ActionProviderBase
from .DirectoryView import base_ignore
from .DirectoryView import ignore
Expand Down
5 changes: 3 additions & 2 deletions Products/CMFCore/browser/actions.py
Expand Up @@ -15,11 +15,12 @@

from xml.dom.minidom import parseString

from zope.component import queryMultiAdapter
from zope.component import queryUtility

from Products.GenericSetup.browser.utils import AddWithPresettingsViewBase
from Products.GenericSetup.interfaces import INode
from Products.GenericSetup.interfaces import ISetupTool
from zope.component import queryMultiAdapter
from zope.component import queryUtility

from ..ActionInformation import Action
from ..ActionInformation import ActionCategory
Expand Down
5 changes: 3 additions & 2 deletions Products/CMFCore/browser/typeinfo.py
Expand Up @@ -15,11 +15,12 @@

from xml.dom.minidom import parseString

from zope.component import queryMultiAdapter
from zope.component import queryUtility

from Products.GenericSetup.browser.utils import AddWithPresettingsViewBase
from Products.GenericSetup.interfaces import IBody
from Products.GenericSetup.interfaces import ISetupTool
from zope.component import queryMultiAdapter
from zope.component import queryUtility

from ..TypesTool import FactoryTypeInformation
from ..TypesTool import ScriptableTypeInformation
Expand Down
5 changes: 3 additions & 2 deletions Products/CMFCore/exportimport/actions.py
Expand Up @@ -13,6 +13,9 @@
"""Actions tool node adapters.
"""

from zope.component import adapts
from zope.component import getSiteManager

from Products.GenericSetup.interfaces import ISetupEnviron
from Products.GenericSetup.utils import I18NURI
from Products.GenericSetup.utils import NodeAdapterBase
Expand All @@ -21,8 +24,6 @@
from Products.GenericSetup.utils import XMLAdapterBase
from Products.GenericSetup.utils import exportObjects
from Products.GenericSetup.utils import importObjects
from zope.component import adapts
from zope.component import getSiteManager

from ..interfaces import IAction
from ..interfaces import IActionCategory
Expand Down
7 changes: 4 additions & 3 deletions Products/CMFCore/exportimport/cachingpolicymgr.py
Expand Up @@ -13,15 +13,16 @@
"""Caching policy manager xml adapters and setup handlers.
"""

from zope.component import adapts
from zope.component import getSiteManager
from zope.component import queryMultiAdapter

from Products.GenericSetup.interfaces import INode
from Products.GenericSetup.interfaces import ISetupEnviron
from Products.GenericSetup.utils import NodeAdapterBase
from Products.GenericSetup.utils import XMLAdapterBase
from Products.GenericSetup.utils import exportObjects
from Products.GenericSetup.utils import importObjects
from zope.component import adapts
from zope.component import getSiteManager
from zope.component import queryMultiAdapter

from ..interfaces import ICachingPolicy
from ..interfaces import ICachingPolicyManager
Expand Down
3 changes: 2 additions & 1 deletion Products/CMFCore/exportimport/catalog.py
Expand Up @@ -13,9 +13,10 @@
"""Catalog tool setup handlers.
"""

from zope.component import getSiteManager

from Products.GenericSetup.utils import exportObjects
from Products.GenericSetup.utils import importObjects
from zope.component import getSiteManager

from ..interfaces import ICatalogTool

Expand Down
7 changes: 4 additions & 3 deletions Products/CMFCore/exportimport/content.py
Expand Up @@ -23,13 +23,14 @@
from six.moves.configparser import ConfigParser

from DateTime import DateTime
from zope.component import getUtility
from zope.interface import implementer
from zope.publisher.interfaces.http import MethodNotAllowed

from Products.GenericSetup.content import DAVAwareFileAdapter
from Products.GenericSetup.content import _globtest
from Products.GenericSetup.interfaces import IFilesystemExporter
from Products.GenericSetup.interfaces import IFilesystemImporter
from zope.component import getUtility
from zope.interface import implementer
from zope.publisher.interfaces.http import MethodNotAllowed

from ..interfaces import ITypesTool

Expand Down
5 changes: 3 additions & 2 deletions Products/CMFCore/exportimport/contenttyperegistry.py
Expand Up @@ -13,12 +13,13 @@
"""Content type registry xml adapters and setup handlers.
"""

from zope.component import adapts
from zope.component import getSiteManager

from Products.GenericSetup.interfaces import ISetupEnviron
from Products.GenericSetup.utils import XMLAdapterBase
from Products.GenericSetup.utils import exportObjects
from Products.GenericSetup.utils import importObjects
from zope.component import adapts
from zope.component import getSiteManager

from ..interfaces import IContentTypeRegistry

Expand Down
5 changes: 3 additions & 2 deletions Products/CMFCore/exportimport/cookieauth.py
Expand Up @@ -13,13 +13,14 @@
"""Cookie crumbler xml adapters and setup handlers.
"""

from zope.component import adapts
from zope.component import getSiteManager

from Products.GenericSetup.interfaces import ISetupEnviron
from Products.GenericSetup.utils import PropertyManagerHelpers
from Products.GenericSetup.utils import XMLAdapterBase
from Products.GenericSetup.utils import exportObjects
from Products.GenericSetup.utils import importObjects
from zope.component import adapts
from zope.component import getSiteManager

from ..interfaces import ICookieCrumbler

Expand Down
3 changes: 2 additions & 1 deletion Products/CMFCore/exportimport/mailhost.py
Expand Up @@ -13,10 +13,11 @@
"""Mailhost setup handlers.
"""

from zope.component import getSiteManager

from Products.GenericSetup.utils import exportObjects
from Products.GenericSetup.utils import importObjects
from Products.MailHost.interfaces import IMailHost
from zope.component import getSiteManager


def importMailHost(context):
Expand Down
5 changes: 3 additions & 2 deletions Products/CMFCore/exportimport/memberdata.py
Expand Up @@ -13,13 +13,14 @@
"""Member data tool xml adapter and setup handlers.
"""

from zope.component import adapts
from zope.component import getSiteManager

from Products.GenericSetup.interfaces import ISetupEnviron
from Products.GenericSetup.utils import PropertyManagerHelpers
from Products.GenericSetup.utils import XMLAdapterBase
from Products.GenericSetup.utils import exportObjects
from Products.GenericSetup.utils import importObjects
from zope.component import adapts
from zope.component import getSiteManager

from ..interfaces import IMemberDataTool

Expand Down
5 changes: 3 additions & 2 deletions Products/CMFCore/exportimport/properties.py
Expand Up @@ -13,12 +13,13 @@
"""Site properties xml adapters and setup handlers.
"""

from zope.component import adapts
from zope.component import queryMultiAdapter

from Products.GenericSetup.interfaces import IBody
from Products.GenericSetup.interfaces import ISetupEnviron
from Products.GenericSetup.utils import PropertyManagerHelpers
from Products.GenericSetup.utils import XMLAdapterBase
from zope.component import adapts
from zope.component import queryMultiAdapter

from ..interfaces import ISiteRoot

Expand Down
5 changes: 3 additions & 2 deletions Products/CMFCore/exportimport/skins.py
Expand Up @@ -15,14 +15,15 @@

from Acquisition import aq_inner
from Acquisition import aq_parent
from zope.component import adapts
from zope.component import getSiteManager

from Products.GenericSetup.interfaces import ISetupEnviron
from Products.GenericSetup.utils import NodeAdapterBase
from Products.GenericSetup.utils import ObjectManagerHelpers
from Products.GenericSetup.utils import XMLAdapterBase
from Products.GenericSetup.utils import exportObjects
from Products.GenericSetup.utils import importObjects
from zope.component import adapts
from zope.component import getSiteManager

from ..interfaces import IDirectoryView
from ..interfaces import ISkinsTool
Expand Down
5 changes: 3 additions & 2 deletions Products/CMFCore/exportimport/tests/test_actions.py
Expand Up @@ -18,13 +18,14 @@
from Acquisition import Implicit
from Acquisition import aq_parent
from OFS.OrderedFolder import OrderedFolder
from zope.component import getSiteManager
from zope.interface import implementer

from Products.GenericSetup.testing import BodyAdapterTestCase
from Products.GenericSetup.testing import NodeAdapterTestCase
from Products.GenericSetup.tests.common import BaseRegistryTests
from Products.GenericSetup.tests.common import DummyExportContext
from Products.GenericSetup.tests.common import DummyImportContext
from zope.component import getSiteManager
from zope.interface import implementer

from ...ActionProviderBase import ActionProviderBase
from ...interfaces import IActionProvider
Expand Down
3 changes: 2 additions & 1 deletion Products/CMFCore/exportimport/tests/test_cachingpolicymgr.py
Expand Up @@ -16,12 +16,13 @@
import unittest

from OFS.Folder import Folder
from zope.component import getSiteManager

from Products.GenericSetup.testing import BodyAdapterTestCase
from Products.GenericSetup.testing import NodeAdapterTestCase
from Products.GenericSetup.tests.common import BaseRegistryTests
from Products.GenericSetup.tests.common import DummyExportContext
from Products.GenericSetup.tests.common import DummyImportContext
from zope.component import getSiteManager

from ...CachingPolicyManager import CachingPolicyManager
from ...interfaces import ICachingPolicyManager
Expand Down
5 changes: 3 additions & 2 deletions Products/CMFCore/exportimport/tests/test_catalog.py
Expand Up @@ -16,15 +16,16 @@
import unittest

from OFS.Folder import Folder
from Testing import ZopeTestCase
from zope.component import getSiteManager

from Products.GenericSetup.tests.common import BaseRegistryTests
from Products.GenericSetup.tests.common import DummyExportContext
from Products.GenericSetup.tests.common import DummyImportContext
from Products.ZCTextIndex.Lexicon import CaseNormalizer
from Products.ZCTextIndex.Lexicon import Splitter
from Products.ZCTextIndex.Lexicon import StopWordRemover
from Products.ZCTextIndex.ZCTextIndex import PLexicon
from Testing import ZopeTestCase
from zope.component import getSiteManager

from ...CatalogTool import CatalogTool
from ...interfaces import ICatalogTool
Expand Down

0 comments on commit 0035f4c

Please sign in to comment.