[Checkins] SVN: Products.GenericSetup/trunk/Products/GenericSetup/ Cleaned up / normalized imports:
Tres Seaver
tseaver at palladion.com
Sat Dec 27 14:43:26 EST 2008
Log message for revision 94383:
Cleaned up / normalized imports:
o Don't import from Globals; instead, use real locations.
o Make other imports use the actual source module, rather than an
intermediate (e.g., prefer importing 'ClassSecurityInfo' from
'AccessControl.SecurityInfo' rather than from 'AccessControl').
o Avoid relative imports, which will break in later versions of Python.
Changed:
U Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt
U Products.GenericSetup/trunk/Products/GenericSetup/__init__.py
U Products.GenericSetup/trunk/Products/GenericSetup/content.py
U Products.GenericSetup/trunk/Products/GenericSetup/context.py
U Products.GenericSetup/trunk/Products/GenericSetup/differ.py
U Products.GenericSetup/trunk/Products/GenericSetup/exceptions.py
U Products.GenericSetup/trunk/Products/GenericSetup/metadata.py
U Products.GenericSetup/trunk/Products/GenericSetup/registry.py
U Products.GenericSetup/trunk/Products/GenericSetup/rolemap.py
U Products.GenericSetup/trunk/Products/GenericSetup/testing.py
U Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py
U Products.GenericSetup/trunk/Products/GenericSetup/tool.py
U Products.GenericSetup/trunk/Products/GenericSetup/upgrade.py
U Products.GenericSetup/trunk/Products/GenericSetup/utils.py
U Products.GenericSetup/trunk/Products/GenericSetup/zcml.py
-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt 2008-12-27 17:04:31 UTC (rev 94382)
+++ Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt 2008-12-27 19:43:26 UTC (rev 94383)
@@ -4,6 +4,16 @@
GenericSetup 1.5.0 (unreleased)
-------------------------------
+- Cleaned up / normalized imports:
+
+ o Don't import from Globals; instead, use real locations.
+
+ o Make other imports use the actual source module, rather than an
+ intermediate (e.g., prefer importing 'ClassSecurityInfo' from
+ 'AccessControl.SecurityInfo' rather than from 'AccessControl').
+
+ o Avoid relative imports, which will break in later versions of Python.
+
- events: Added 'handleProfileImportedEvent' subscriber.
After a full import it updates 'last version for profile'.
Modified: Products.GenericSetup/trunk/Products/GenericSetup/__init__.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/__init__.py 2008-12-27 17:04:31 UTC (rev 94382)
+++ Products.GenericSetup/trunk/Products/GenericSetup/__init__.py 2008-12-27 19:43:26 UTC (rev 94383)
@@ -3,11 +3,13 @@
$Id$
"""
-from AccessControl import ModuleSecurityInfo
+from AccessControl.SecurityInfo import ModuleSecurityInfo
-from interfaces import BASE, EXTENSION
-from permissions import ManagePortal
-from registry import _profile_registry as profile_registry
+from Products.GenericSetup.interfaces import BASE
+from Products.GenericSetup.interfaces import EXTENSION
+from Products.GenericSetup.permissions import ManagePortal
+from Products.GenericSetup.registry import _profile_registry \
+ as profile_registry
security = ModuleSecurityInfo('Products.GenericSetup')
security.declareProtected(ManagePortal, 'profile_registry')
Modified: Products.GenericSetup/trunk/Products/GenericSetup/content.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/content.py 2008-12-27 17:04:31 UTC (rev 94382)
+++ Products.GenericSetup/trunk/Products/GenericSetup/content.py 2008-12-27 19:43:26 UTC (rev 94383)
@@ -26,14 +26,14 @@
from zope.interface import implements
from zope.interface import directlyProvides
-from interfaces import IContentFactory
-from interfaces import IContentFactoryName
-from interfaces import IFilesystemExporter
-from interfaces import IFilesystemImporter
-from interfaces import IINIAware
-from interfaces import ISetupTool
-from utils import _getDottedName
-from utils import _resolveDottedName
+from Products.GenericSetup.interfaces import IContentFactory
+from Products.GenericSetup.interfaces import IContentFactoryName
+from Products.GenericSetup.interfaces import IFilesystemExporter
+from Products.GenericSetup.interfaces import IFilesystemImporter
+from Products.GenericSetup.interfaces import IINIAware
+from Products.GenericSetup.interfaces import ISetupTool
+from Products.GenericSetup.utils import _getDottedName
+from Products.GenericSetup.utils import _resolveDottedName
#
# setup_tool handlers
Modified: Products.GenericSetup/trunk/Products/GenericSetup/context.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/context.py 2008-12-27 17:04:31 UTC (rev 94382)
+++ Products.GenericSetup/trunk/Products/GenericSetup/context.py 2008-12-27 19:43:26 UTC (rev 94383)
@@ -24,13 +24,13 @@
from tarfile import TarFile
from tarfile import TarInfo
-from AccessControl import ClassSecurityInfo
+from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_inner
from Acquisition import aq_parent
from Acquisition import aq_self
from Acquisition import Implicit
from DateTime.DateTime import DateTime
-from Globals import InitializeClass
+from App.class_init import default__class_init__ as InitializeClass
from OFS.DTMLDocument import DTMLDocument
from OFS.Folder import Folder
from OFS.Image import File
@@ -39,15 +39,15 @@
from Products.PythonScripts.PythonScript import PythonScript
from zope.interface import implements
-from interfaces import IChunkableExportContext
-from interfaces import IChunkableImportContext
-from interfaces import IExportContext
-from interfaces import IImportContext
-from interfaces import ISetupEnviron
-from interfaces import IWriteLogger
-from interfaces import SKIPPED_FILES
-from interfaces import SKIPPED_SUFFIXES
-from permissions import ManagePortal
+from Products.GenericSetup.interfaces import IChunkableExportContext
+from Products.GenericSetup.interfaces import IChunkableImportContext
+from Products.GenericSetup.interfaces import IExportContext
+from Products.GenericSetup.interfaces import IImportContext
+from Products.GenericSetup.interfaces import ISetupEnviron
+from Products.GenericSetup.interfaces import IWriteLogger
+from Products.GenericSetup.interfaces import SKIPPED_FILES
+from Products.GenericSetup.interfaces import SKIPPED_SUFFIXES
+from Products.GenericSetup.permissions import ManagePortal
class Logger:
Modified: Products.GenericSetup/trunk/Products/GenericSetup/differ.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/differ.py 2008-12-27 17:04:31 UTC (rev 94382)
+++ Products.GenericSetup/trunk/Products/GenericSetup/differ.py 2008-12-27 19:43:26 UTC (rev 94383)
@@ -18,10 +18,10 @@
from difflib import unified_diff
import re
-from Globals import InitializeClass
-from AccessControl import ClassSecurityInfo
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from App.class_init import default__class_init__ as InitializeClass
-from interfaces import SKIPPED_FILES
+from Products.GenericSetup.interfaces import SKIPPED_FILES
BLANKS_REGEX = re.compile( r'^\s*$' )
Modified: Products.GenericSetup/trunk/Products/GenericSetup/exceptions.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/exceptions.py 2008-12-27 17:04:31 UTC (rev 94382)
+++ Products.GenericSetup/trunk/Products/GenericSetup/exceptions.py 2008-12-27 19:43:26 UTC (rev 94383)
@@ -15,7 +15,7 @@
$Id$
"""
-from AccessControl import ModuleSecurityInfo
+from AccessControl.SecurityInfo import ModuleSecurityInfo
security = ModuleSecurityInfo('Products.GenericSetup.exceptions')
security.declarePublic('BadRequest')
Modified: Products.GenericSetup/trunk/Products/GenericSetup/metadata.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/metadata.py 2008-12-27 17:04:31 UTC (rev 94382)
+++ Products.GenericSetup/trunk/Products/GenericSetup/metadata.py 2008-12-27 19:43:26 UTC (rev 94383)
@@ -16,8 +16,11 @@
"""
import os
-from utils import ImportConfiguratorBase, _getProductPath
-from utils import CONVERTER, DEFAULT, KEY
+from Products.GenericSetup.utils import _getProductPath
+from Products.GenericSetup.utils import ImportConfiguratorBase
+from Products.GenericSetup.utils import CONVERTER
+from Products.GenericSetup.utils import DEFAULT
+from Products.GenericSetup.utils import KEY
METADATA_XML = 'metadata.xml'
Modified: Products.GenericSetup/trunk/Products/GenericSetup/registry.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/registry.py 2008-12-27 17:04:31 UTC (rev 94382)
+++ Products.GenericSetup/trunk/Products/GenericSetup/registry.py 2008-12-27 19:43:26 UTC (rev 94383)
@@ -18,25 +18,24 @@
from xml.sax import parseString
from xml.sax.handler import ContentHandler
-from AccessControl import ClassSecurityInfo
+from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import Implicit
-from Globals import InitializeClass
-import App.Product
+from App.class_init import default__class_init__ as InitializeClass
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from zope.interface import implements
-from interfaces import BASE
-from interfaces import IImportStepRegistry
-from interfaces import IExportStepRegistry
-from interfaces import IToolsetRegistry
-from interfaces import IProfileRegistry
-from permissions import ManagePortal
-from metadata import ProfileMetadata
-from utils import _xmldir
-from utils import _getDottedName
-from utils import _resolveDottedName
-from utils import _extractDocstring
-from utils import _computeTopologicalSort
+from Products.GenericSetup.interfaces import BASE
+from Products.GenericSetup.interfaces import IImportStepRegistry
+from Products.GenericSetup.interfaces import IExportStepRegistry
+from Products.GenericSetup.interfaces import IToolsetRegistry
+from Products.GenericSetup.interfaces import IProfileRegistry
+from Products.GenericSetup.permissions import ManagePortal
+from Products.GenericSetup.metadata import ProfileMetadata
+from Products.GenericSetup.utils import _xmldir
+from Products.GenericSetup.utils import _getDottedName
+from Products.GenericSetup.utils import _resolveDottedName
+from Products.GenericSetup.utils import _extractDocstring
+from Products.GenericSetup.utils import _computeTopologicalSort
#
# XML parser
Modified: Products.GenericSetup/trunk/Products/GenericSetup/rolemap.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/rolemap.py 2008-12-27 17:04:31 UTC (rev 94382)
+++ Products.GenericSetup/trunk/Products/GenericSetup/rolemap.py 2008-12-27 19:43:26 UTC (rev 94383)
@@ -15,16 +15,16 @@
$Id$
"""
-from AccessControl import ClassSecurityInfo
from AccessControl.Permission import Permission
-from Globals import InitializeClass
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from App.class_init import default__class_init__ as InitializeClass
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
-from permissions import ManagePortal
-from utils import _xmldir
-from utils import ExportConfiguratorBase
-from utils import ImportConfiguratorBase
-from utils import CONVERTER, DEFAULT, KEY
+from Products.GenericSetup.permissions import ManagePortal
+from Products.GenericSetup.utils import _xmldir
+from Products.GenericSetup.utils import ExportConfiguratorBase
+from Products.GenericSetup.utils import ImportConfiguratorBase
+from Products.GenericSetup.utils import CONVERTER, DEFAULT, KEY
#
Modified: Products.GenericSetup/trunk/Products/GenericSetup/testing.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/testing.py 2008-12-27 17:04:31 UTC (rev 94382)
+++ Products.GenericSetup/trunk/Products/GenericSetup/testing.py 2008-12-27 19:43:26 UTC (rev 94383)
@@ -20,18 +20,16 @@
from xml.dom.minidom import parseString
-import Products.Five
from OFS.interfaces import IItem
-from Products.Five import zcml
from zope.component import getMultiAdapter
from zope.interface import implements
from zope.interface.verify import verifyClass
from zope.testing import testrunner
from zope.testing.cleanup import cleanUp
-from interfaces import IBody
-from interfaces import INode
-from interfaces import ISetupEnviron
+from Products.GenericSetup.interfaces import IBody
+from Products.GenericSetup.interfaces import INode
+from Products.GenericSetup.interfaces import ISetupEnviron
class DummyLogger:
@@ -148,6 +146,7 @@
@classmethod
def setUp(cls):
import Products.Five
+ from Products.Five import zcml
import Products.GenericSetup
zcml.load_config('meta.zcml', Products.Five)
Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py 2008-12-27 17:04:31 UTC (rev 94382)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py 2008-12-27 19:43:26 UTC (rev 94383)
@@ -18,9 +18,9 @@
import unittest
import Testing
-from AccessControl import ClassSecurityInfo
+from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_base
-from Globals import InitializeClass
+from App.class_init import default__class_init__ as InitializeClass
from OFS.Folder import Folder
from OFS.SimpleItem import SimpleItem
from Products.Five.component import enableSite
Modified: Products.GenericSetup/trunk/Products/GenericSetup/tool.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tool.py 2008-12-27 17:04:31 UTC (rev 94382)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tool.py 2008-12-27 19:43:26 UTC (rev 94383)
@@ -20,9 +20,9 @@
import time
from cgi import escape
-from AccessControl import ClassSecurityInfo
+from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_base
-from Globals import InitializeClass
+from App.class_init import default__class_init__ as InitializeClass
from OFS.Folder import Folder
from OFS.Image import File
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
@@ -30,32 +30,32 @@
from zope import event
from zope.interface import implements
-from context import DirectoryImportContext
-from context import SnapshotExportContext
-from context import SnapshotImportContext
-from context import TarballExportContext
-from context import TarballImportContext
-from differ import ConfigDiff
-from events import BeforeProfileImportEvent
-from events import ProfileImportedEvent
-from interfaces import BASE
-from interfaces import EXTENSION
-from interfaces import ISetupTool
-from interfaces import SKIPPED_FILES
-from permissions import ManagePortal
-from registry import ExportStepRegistry
-from registry import ImportStepRegistry
-from registry import ToolsetRegistry
-from registry import _export_step_registry
-from registry import _import_step_registry
-from registry import _profile_registry
-from upgrade import _upgrade_registry
-from upgrade import listProfilesWithUpgrades
-from upgrade import listUpgradeSteps
-from utils import _computeTopologicalSort
-from utils import _getProductPath
-from utils import _resolveDottedName
-from utils import _wwwdir
+from Products.GenericSetup.context import DirectoryImportContext
+from Products.GenericSetup.context import SnapshotExportContext
+from Products.GenericSetup.context import SnapshotImportContext
+from Products.GenericSetup.context import TarballExportContext
+from Products.GenericSetup.context import TarballImportContext
+from Products.GenericSetup.differ import ConfigDiff
+from Products.GenericSetup.events import BeforeProfileImportEvent
+from Products.GenericSetup.events import ProfileImportedEvent
+from Products.GenericSetup.interfaces import BASE
+from Products.GenericSetup.interfaces import EXTENSION
+from Products.GenericSetup.interfaces import ISetupTool
+from Products.GenericSetup.interfaces import SKIPPED_FILES
+from Products.GenericSetup.permissions import ManagePortal
+from Products.GenericSetup.registry import ExportStepRegistry
+from Products.GenericSetup.registry import ImportStepRegistry
+from Products.GenericSetup.registry import ToolsetRegistry
+from Products.GenericSetup.registry import _export_step_registry
+from Products.GenericSetup.registry import _import_step_registry
+from Products.GenericSetup.registry import _profile_registry
+from Products.GenericSetup.upgrade import _upgrade_registry
+from Products.GenericSetup.upgrade import listProfilesWithUpgrades
+from Products.GenericSetup.upgrade import listUpgradeSteps
+from Products.GenericSetup.utils import _computeTopologicalSort
+from Products.GenericSetup.utils import _getProductPath
+from Products.GenericSetup.utils import _resolveDottedName
+from Products.GenericSetup.utils import _wwwdir
IMPORT_STEPS_XML = 'import_steps.xml'
EXPORT_STEPS_XML = 'export_steps.xml'
Modified: Products.GenericSetup/trunk/Products/GenericSetup/upgrade.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/upgrade.py 2008-12-27 17:04:31 UTC (rev 94382)
+++ Products.GenericSetup/trunk/Products/GenericSetup/upgrade.py 2008-12-27 19:43:26 UTC (rev 94383)
@@ -16,9 +16,10 @@
"""
from pkg_resources import parse_version
+
from BTrees.OOBTree import OOBTree
-from registry import _profile_registry
+from Products.GenericSetup.registry import _profile_registry
def normalize_version(version):
Modified: Products.GenericSetup/trunk/Products/GenericSetup/utils.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/utils.py 2008-12-27 17:04:31 UTC (rev 94382)
+++ Products.GenericSetup/trunk/Products/GenericSetup/utils.py 2008-12-27 19:43:26 UTC (rev 94383)
@@ -26,11 +26,10 @@
from xml.dom.minidom import parseString
from xml.parsers.expat import ExpatError
-import Products
-from AccessControl import ClassSecurityInfo
+from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import Implicit
-from Globals import InitializeClass
-from Globals import package_home
+from App.class_init import default__class_init__ as InitializeClass
+from App.Common import package_home
from OFS.interfaces import IOrderedContainer
from Products.Five.utilities.interfaces import IMarkerInterfaces
from zope.component import queryMultiAdapter
@@ -40,12 +39,12 @@
from zope.interface import providedBy
from ZPublisher.HTTPRequest import default_encoding
-from exceptions import BadRequest
-from interfaces import IBody
-from interfaces import INode
-from interfaces import ISetupContext
-from interfaces import ISetupTool
-from permissions import ManagePortal
+from Products.GenericSetup.exceptions import BadRequest
+from Products.GenericSetup.interfaces import IBody
+from Products.GenericSetup.interfaces import INode
+from Products.GenericSetup.interfaces import ISetupContext
+from Products.GenericSetup.interfaces import ISetupTool
+from Products.GenericSetup.permissions import ManagePortal
_pkgdir = package_home( globals() )
@@ -542,6 +541,7 @@
self.context._delObject(obj_id)
def _initObjects(self, node):
+ import Products
for child in node.childNodes:
if child.nodeName != 'object':
continue
Modified: Products.GenericSetup/trunk/Products/GenericSetup/zcml.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/zcml.py 2008-12-27 17:04:31 UTC (rev 94382)
+++ Products.GenericSetup/trunk/Products/GenericSetup/zcml.py 2008-12-27 19:43:26 UTC (rev 94383)
@@ -21,11 +21,11 @@
from zope.configuration.fields import PythonIdentifier
from zope.interface import Interface
-from interfaces import BASE
-from registry import _import_step_registry
-from registry import _export_step_registry
-from registry import _profile_registry
-from upgrade import _upgrade_registry
+from Products.GenericSetup.interfaces import BASE
+from Products.GenericSetup.registry import _import_step_registry
+from Products.GenericSetup.registry import _export_step_registry
+from Products.GenericSetup.registry import _profile_registry
+from Products.GenericSetup.upgrade import _upgrade_registry
#### genericsetup:registerProfile
More information about the Checkins
mailing list