[Checkins] SVN: Products.CMFUid/trunk/Products/CMFUid/ Cleaned up / normalized imports:
Tres Seaver
tseaver at palladion.com
Sat Dec 27 17:06:30 EST 2008
Log message for revision 94394:
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').
Changed:
U Products.CMFUid/trunk/Products/CMFUid/CHANGES.txt
U Products.CMFUid/trunk/Products/CMFUid/UniqueIdAnnotationTool.py
U Products.CMFUid/trunk/Products/CMFUid/UniqueIdGeneratorTool.py
U Products.CMFUid/trunk/Products/CMFUid/UniqueIdHandlerTool.py
U Products.CMFUid/trunk/Products/CMFUid/__init__.py
-=-
Modified: Products.CMFUid/trunk/Products/CMFUid/CHANGES.txt
===================================================================
--- Products.CMFUid/trunk/Products/CMFUid/CHANGES.txt 2008-12-27 22:02:51 UTC (rev 94393)
+++ Products.CMFUid/trunk/Products/CMFUid/CHANGES.txt 2008-12-27 22:06:30 UTC (rev 94394)
@@ -4,6 +4,14 @@
2.2.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').
+
- Add missing utility registration for IUniqueIdHandler. See
https://bugs.launchpad.net/bugs/299058 .
Modified: Products.CMFUid/trunk/Products/CMFUid/UniqueIdAnnotationTool.py
===================================================================
--- Products.CMFUid/trunk/Products/CMFUid/UniqueIdAnnotationTool.py 2008-12-27 22:02:51 UTC (rev 94393)
+++ Products.CMFUid/trunk/Products/CMFUid/UniqueIdAnnotationTool.py 2008-12-27 22:06:30 UTC (rev 94394)
@@ -17,13 +17,13 @@
$Id$
"""
-from AccessControl import ClassSecurityInfo
+from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import Implicit
-from Globals import InitializeClass
-from Globals import Persistent
+from App.class_init import default__class_init__ as InitializeClass
from OFS.interfaces import IObjectClonedEvent
from OFS.PropertyManager import PropertyManager
from OFS.SimpleItem import SimpleItem
+from Persistence import Persistent
from zope.app.container.interfaces import IObjectAddedEvent
from zope.component import queryUtility
from zope.interface import implements
Modified: Products.CMFUid/trunk/Products/CMFUid/UniqueIdGeneratorTool.py
===================================================================
--- Products.CMFUid/trunk/Products/CMFUid/UniqueIdGeneratorTool.py 2008-12-27 22:02:51 UTC (rev 94393)
+++ Products.CMFUid/trunk/Products/CMFUid/UniqueIdGeneratorTool.py 2008-12-27 22:06:30 UTC (rev 94394)
@@ -17,9 +17,9 @@
$Id$
"""
-from AccessControl import ClassSecurityInfo
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from App.class_init import default__class_init__ as InitializeClass
from BTrees.Length import Length
-from Globals import InitializeClass
from OFS.SimpleItem import SimpleItem
from zope.interface import implements
Modified: Products.CMFUid/trunk/Products/CMFUid/UniqueIdHandlerTool.py
===================================================================
--- Products.CMFUid/trunk/Products/CMFUid/UniqueIdHandlerTool.py 2008-12-27 22:02:51 UTC (rev 94393)
+++ Products.CMFUid/trunk/Products/CMFUid/UniqueIdHandlerTool.py 2008-12-27 22:06:30 UTC (rev 94394)
@@ -21,10 +21,10 @@
import os
import Missing
-from AccessControl import ClassSecurityInfo
+from AccessControl.SecurityInfo import ClassSecurityInfo
from Acquisition import aq_base
-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.SimpleItem import SimpleItem
from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from zope.component import getUtility
Modified: Products.CMFUid/trunk/Products/CMFUid/__init__.py
===================================================================
--- Products.CMFUid/trunk/Products/CMFUid/__init__.py 2008-12-27 22:02:51 UTC (rev 94393)
+++ Products.CMFUid/trunk/Products/CMFUid/__init__.py 2008-12-27 22:06:30 UTC (rev 94394)
@@ -15,20 +15,20 @@
$Id$
"""
-from Products.CMFCore import utils
+def initialize(context):
-import UniqueIdAnnotationTool
-import UniqueIdGeneratorTool
-import UniqueIdHandlerTool
+ from Products.CMFCore import utils
+ import UniqueIdAnnotationTool
+ import UniqueIdGeneratorTool
+ import UniqueIdHandlerTool
-tools = (
- UniqueIdAnnotationTool.UniqueIdAnnotationTool,
- UniqueIdGeneratorTool.UniqueIdGeneratorTool,
- UniqueIdHandlerTool.UniqueIdHandlerTool,
-)
-def initialize(context):
+ tools = (
+ UniqueIdAnnotationTool.UniqueIdAnnotationTool,
+ UniqueIdGeneratorTool.UniqueIdGeneratorTool,
+ UniqueIdHandlerTool.UniqueIdHandlerTool,
+ )
utils.ToolInit( 'CMF Unique Id Tool'
, tools=tools
More information about the Checkins
mailing list