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

[Tres Seaver]

Log message for revision 94391:
  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.CMFTopic/trunk/Products/CMFTopic/AbstractCriterion.py
  U   Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt
  U   Products.CMFTopic/trunk/Products/CMFTopic/DateCriteria.py
  U   Products.CMFTopic/trunk/Products/CMFTopic/ListCriterion.py
  U   Products.CMFTopic/trunk/Products/CMFTopic/SimpleIntCriterion.py
  U   Products.CMFTopic/trunk/Products/CMFTopic/SimpleStringCriterion.py
  U   Products.CMFTopic/trunk/Products/CMFTopic/SortCriterion.py
  U   Products.CMFTopic/trunk/Products/CMFTopic/Topic.py
  U   Products.CMFTopic/trunk/Products/CMFTopic/__init__.py
  U   Products.CMFTopic/trunk/Products/CMFTopic/exportimport.py

-=-
Modified: Products.CMFTopic/trunk/Products/CMFTopic/AbstractCriterion.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/AbstractCriterion.py	2008-12-27 21:48:36 UTC (rev 94390)
+++ Products.CMFTopic/trunk/Products/CMFTopic/AbstractCriterion.py	2008-12-27 21:56:17 UTC (rev 94391)
@@ -14,14 +14,14 @@
 
 $Id$
 """
+from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import Implicit
-from AccessControl import ClassSecurityInfo
+from App.class_init import default__class_init__ as InitializeClass
+from OFS.SimpleItem import Item
 from Persistence import Persistent
-from Globals import InitializeClass
-from OFS.SimpleItem import Item
 
-from permissions import AccessContentsInformation
-from permissions import ChangeTopics
+from Products.CMFTopic.permissions import AccessContentsInformation
+from Products.CMFTopic.permissions import ChangeTopics
 
 
 class AbstractCriterion( Persistent, Item, Implicit ):

Modified: Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt	2008-12-27 21:48:36 UTC (rev 94390)
+++ Products.CMFTopic/trunk/Products/CMFTopic/CHANGES.txt	2008-12-27 21:56:17 UTC (rev 94391)
@@ -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: Added an add view expression to the Topic content type definition.
 
 - Topic GenericSetup definition: Add an icon URL expression to the Topic

Modified: Products.CMFTopic/trunk/Products/CMFTopic/DateCriteria.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/DateCriteria.py	2008-12-27 21:48:36 UTC (rev 94390)
+++ Products.CMFTopic/trunk/Products/CMFTopic/DateCriteria.py	2008-12-27 21:56:17 UTC (rev 94391)
@@ -15,16 +15,16 @@
 $Id$
 """
 
-from AccessControl import ClassSecurityInfo
+from AccessControl.SecurityInfo import ClassSecurityInfo
 from DateTime.DateTime import DateTime
-from Globals import InitializeClass
+from App.class_init import default__class_init__ as InitializeClass
 from zope.interface import implements
 
-from AbstractCriterion import AbstractCriterion
-from interfaces import ICriterion
-from permissions import ChangeTopics
-from permissions import View
-from Topic import Topic
+from Products.CMFTopic.AbstractCriterion import AbstractCriterion
+from Products.CMFTopic.interfaces import ICriterion
+from Products.CMFTopic.permissions import ChangeTopics
+from Products.CMFTopic.permissions import View
+from Products.CMFTopic.Topic import Topic
 
 _as_of = DateTime  # Allow for controlled value when testing
 

Modified: Products.CMFTopic/trunk/Products/CMFTopic/ListCriterion.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/ListCriterion.py	2008-12-27 21:48:36 UTC (rev 94390)
+++ Products.CMFTopic/trunk/Products/CMFTopic/ListCriterion.py	2008-12-27 21:56:17 UTC (rev 94391)
@@ -15,15 +15,15 @@
 $Id$
 """
 
-from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from App.class_init import default__class_init__ as InitializeClass
 from zope.interface import implements
 
-from AbstractCriterion import AbstractCriterion
-from interfaces import ICriterion
-from permissions import ChangeTopics
-from permissions import View
-from Topic import Topic
+from Products.CMFTopic.AbstractCriterion import AbstractCriterion
+from Products.CMFTopic.interfaces import ICriterion
+from Products.CMFTopic.permissions import ChangeTopics
+from Products.CMFTopic.permissions import View
+from Products.CMFTopic.Topic import Topic
 
 
 class ListCriterion( AbstractCriterion ):

Modified: Products.CMFTopic/trunk/Products/CMFTopic/SimpleIntCriterion.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/SimpleIntCriterion.py	2008-12-27 21:48:36 UTC (rev 94390)
+++ Products.CMFTopic/trunk/Products/CMFTopic/SimpleIntCriterion.py	2008-12-27 21:56:17 UTC (rev 94391)
@@ -15,15 +15,15 @@
 $Id$
 """
 
-from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from App.class_init import default__class_init__ as InitializeClass
 from zope.interface import implements
 
-from AbstractCriterion import AbstractCriterion
-from interfaces import ICriterion
-from permissions import ChangeTopics
-from permissions import View
-from Topic import Topic
+from Products.CMFTopic.AbstractCriterion import AbstractCriterion
+from Products.CMFTopic.interfaces import ICriterion
+from Products.CMFTopic.permissions import ChangeTopics
+from Products.CMFTopic.permissions import View
+from Products.CMFTopic.Topic import Topic
 
 
 class SimpleIntCriterion( AbstractCriterion ):

Modified: Products.CMFTopic/trunk/Products/CMFTopic/SimpleStringCriterion.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/SimpleStringCriterion.py	2008-12-27 21:48:36 UTC (rev 94390)
+++ Products.CMFTopic/trunk/Products/CMFTopic/SimpleStringCriterion.py	2008-12-27 21:56:17 UTC (rev 94391)
@@ -15,15 +15,15 @@
 $Id$
 """
 
-from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from App.class_init import default__class_init__ as InitializeClass
 from zope.interface import implements
 
-from AbstractCriterion import AbstractCriterion
-from interfaces import ICriterion
-from permissions import ChangeTopics
-from permissions import View
-from Topic import Topic
+from Products.CMFTopic.AbstractCriterion import AbstractCriterion
+from Products.CMFTopic.interfaces import ICriterion
+from Products.CMFTopic.permissions import ChangeTopics
+from Products.CMFTopic.permissions import View
+from Products.CMFTopic.Topic import Topic
 
 
 class SimpleStringCriterion( AbstractCriterion ):

Modified: Products.CMFTopic/trunk/Products/CMFTopic/SortCriterion.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/SortCriterion.py	2008-12-27 21:48:36 UTC (rev 94390)
+++ Products.CMFTopic/trunk/Products/CMFTopic/SortCriterion.py	2008-12-27 21:56:17 UTC (rev 94391)
@@ -15,15 +15,15 @@
 $Id$
 """
 
-from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from App.class_init import default__class_init__ as InitializeClass
 from zope.interface import implements
 
-from AbstractCriterion import AbstractCriterion
-from interfaces import ICriterion
-from permissions import ChangeTopics
-from permissions import View
-from Topic import Topic
+from Products.CMFTopic.AbstractCriterion import AbstractCriterion
+from Products.CMFTopic.interfaces import ICriterion
+from Products.CMFTopic.permissions import ChangeTopics
+from Products.CMFTopic.permissions import View
+from Products.CMFTopic.Topic import Topic
 
 
 class SortCriterion( AbstractCriterion ):

Modified: Products.CMFTopic/trunk/Products/CMFTopic/Topic.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/Topic.py	2008-12-27 21:48:36 UTC (rev 94390)
+++ Products.CMFTopic/trunk/Products/CMFTopic/Topic.py	2008-12-27 21:56:17 UTC (rev 94391)
@@ -15,10 +15,9 @@
 $Id$
 """
 
-from AccessControl import ClassSecurityInfo
+from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import aq_parent, aq_inner
-from Globals import InitializeClass
-
+from App.class_init import default__class_init__ as InitializeClass
 from zope.component import getUtility
 from zope.component.factory import Factory
 from zope.interface import implements
@@ -27,11 +26,11 @@
 from Products.CMFCore.interfaces import ISyndicationTool
 from Products.CMFCore.utils import getToolByName
 
-from interfaces import IMutableTopic
-from interfaces import ITopic
-from permissions import View
-from permissions import AddTopics
-from permissions import ChangeTopics
+from Products.CMFTopic.interfaces import IMutableTopic
+from Products.CMFTopic.interfaces import ITopic
+from Products.CMFTopic.permissions import View
+from Products.CMFTopic.permissions import AddTopics
+from Products.CMFTopic.permissions import ChangeTopics
 
 
 def addTopic(self, id, title='', REQUEST=None):

Modified: Products.CMFTopic/trunk/Products/CMFTopic/__init__.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/__init__.py	2008-12-27 21:48:36 UTC (rev 94390)
+++ Products.CMFTopic/trunk/Products/CMFTopic/__init__.py	2008-12-27 21:56:17 UTC (rev 94391)
@@ -15,20 +15,20 @@
 $Id$
 """
 
-from Products.CMFCore.utils import ContentInit
+def initialize(context):
 
-import Topic
-from permissions import AddTopics
+    from Products.CMFCore.utils import ContentInit
 
+    import Topic
+    from permissions import AddTopics
 
-# Make sure security is initialized
-import DateCriteria
-import ListCriterion
-import SimpleIntCriterion
-import SimpleStringCriterion
-import SortCriterion
 
-def initialize(context):
+    # Make sure security is initialized
+    import DateCriteria
+    import ListCriterion
+    import SimpleIntCriterion
+    import SimpleStringCriterion
+    import SortCriterion
 
     context.registerHelpTitle( 'CMF Topic Help' )
     context.registerHelp( directory='help' )

Modified: Products.CMFTopic/trunk/Products/CMFTopic/exportimport.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/exportimport.py	2008-12-27 21:48:36 UTC (rev 94390)
+++ Products.CMFTopic/trunk/Products/CMFTopic/exportimport.py	2008-12-27 21:56:17 UTC (rev 94391)
@@ -22,16 +22,14 @@
 from Products.GenericSetup.interfaces import IFilesystemExporter
 from Products.GenericSetup.interfaces import IFilesystemImporter
 from Products.GenericSetup.content import FolderishExporterImporter
-
 try:
     from Products.GenericSetup.utils import PageTemplateResource
 except ImportError: # BBB:  no egg support
     from Products.PageTemplates.PageTemplateFile \
         import PageTemplateFile as PageTemplateResource
 
+from Products.CMFTopic.Topic import Topic
 
-from Topic import Topic
-
 class TopicExportImport(FolderishExporterImporter):
     """ Dump topic criteria to / from an XML file.
     """