[Checkins] SVN: Products.CMFActionIcons/trunk/Products/CMFActionIcons/ Cleaned up / normalized imports:

Tres Seaver tseaver at palladion.com
Sat Dec 27 16:58:48 EST 2008


Log message for revision 94392:
  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.CMFActionIcons/trunk/Products/CMFActionIcons/ActionIconsTool.py
  U   Products.CMFActionIcons/trunk/Products/CMFActionIcons/CHANGES.txt
  U   Products.CMFActionIcons/trunk/Products/CMFActionIcons/__init__.py
  U   Products.CMFActionIcons/trunk/Products/CMFActionIcons/exportimport.py

-=-
Modified: Products.CMFActionIcons/trunk/Products/CMFActionIcons/ActionIconsTool.py
===================================================================
--- Products.CMFActionIcons/trunk/Products/CMFActionIcons/ActionIconsTool.py	2008-12-27 21:56:17 UTC (rev 94391)
+++ Products.CMFActionIcons/trunk/Products/CMFActionIcons/ActionIconsTool.py	2008-12-27 21:58:47 UTC (rev 94392)
@@ -17,9 +17,9 @@
 
 import os
 
-from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass
-from Globals import package_home
+from AccessControl.SecurityInfo import ClassSecurityInfo
+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.interface import implements
@@ -28,9 +28,9 @@
 from Products.CMFCore.utils import registerToolInterface
 from Products.CMFCore.utils import UniqueObject
 
-from interfaces import IActionIconsTool
-from permissions import ManagePortal
-from permissions import View
+from Products.CMFActionIcons.interfaces import IActionIconsTool
+from Products.CMFActionIcons.permissions import ManagePortal
+from Products.CMFActionIcons.permissions import View
 
 _wwwdir = os.path.join( package_home( globals() ), 'www' )
 

Modified: Products.CMFActionIcons/trunk/Products/CMFActionIcons/CHANGES.txt
===================================================================
--- Products.CMFActionIcons/trunk/Products/CMFActionIcons/CHANGES.txt	2008-12-27 21:56:17 UTC (rev 94391)
+++ Products.CMFActionIcons/trunk/Products/CMFActionIcons/CHANGES.txt	2008-12-27 21:58:47 UTC (rev 94392)
@@ -4,6 +4,16 @@
 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').
+
+  o Avoid relative imports, which will break in later versions of Python.
+
 - profiles: Removed obsolete local import and export step registrations.
 
 - setup handler: Registered steps globally.

Modified: Products.CMFActionIcons/trunk/Products/CMFActionIcons/__init__.py
===================================================================
--- Products.CMFActionIcons/trunk/Products/CMFActionIcons/__init__.py	2008-12-27 21:56:17 UTC (rev 94391)
+++ Products.CMFActionIcons/trunk/Products/CMFActionIcons/__init__.py	2008-12-27 21:58:47 UTC (rev 94392)
@@ -17,11 +17,11 @@
 $Id$
 """
 
-from Products.CMFCore.utils import ToolInit
+def initialize(context):
 
-import ActionIconsTool
+    from Products.CMFCore.utils import ToolInit
 
-def initialize(context):
+    import ActionIconsTool
 
     ToolInit( meta_type='CMF Action Icons Tool'
             , tools=( ActionIconsTool.ActionIconsTool, )

Modified: Products.CMFActionIcons/trunk/Products/CMFActionIcons/exportimport.py
===================================================================
--- Products.CMFActionIcons/trunk/Products/CMFActionIcons/exportimport.py	2008-12-27 21:56:17 UTC (rev 94391)
+++ Products.CMFActionIcons/trunk/Products/CMFActionIcons/exportimport.py	2008-12-27 21:58:47 UTC (rev 94392)
@@ -17,9 +17,9 @@
 
 import os
 
-from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass
-from Globals import package_home
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from App.class_init import default__class_init__ as InitializeClass
+from App.Common import package_home
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 
 from zope.component import getSiteManager
@@ -30,8 +30,8 @@
 from Products.GenericSetup.utils import ImportConfiguratorBase
 from Products.GenericSetup.utils import KEY
 
-from interfaces import IActionIconsTool
-from permissions import ManagePortal
+from Products.CMFActionIcons.interfaces import IActionIconsTool
+from Products.CMFActionIcons.permissions import ManagePortal
 
 _pkgdir = package_home( globals() )
 _xmldir = os.path.join( _pkgdir, 'xml' )



More information about the Checkins mailing list