[Checkins] SVN: Products.CMFTopic/trunk/Products/CMFTopic/ - import cleanup

[Yvo Schubbe]

Log message for revision 94489:
  - import cleanup

Changed:
  U   Products.CMFTopic/trunk/Products/CMFTopic/AbstractCriterion.py
  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/tests/test_Topic.py

-=-
Modified: Products.CMFTopic/trunk/Products/CMFTopic/AbstractCriterion.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/AbstractCriterion.py	2009-01-03 16:28:03 UTC (rev 94488)
+++ Products.CMFTopic/trunk/Products/CMFTopic/AbstractCriterion.py	2009-01-03 16:28:19 UTC (rev 94489)
@@ -14,9 +14,10 @@
 
 $Id$
 """
+
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import Implicit
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from OFS.SimpleItem import Item
 from Persistence import Persistent
 

Modified: Products.CMFTopic/trunk/Products/CMFTopic/DateCriteria.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/DateCriteria.py	2009-01-03 16:28:03 UTC (rev 94488)
+++ Products.CMFTopic/trunk/Products/CMFTopic/DateCriteria.py	2009-01-03 16:28:19 UTC (rev 94489)
@@ -16,8 +16,8 @@
 """
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
+from App.class_init import InitializeClass
 from DateTime.DateTime import DateTime
-from App.class_init import default__class_init__ as InitializeClass
 from zope.interface import implements
 
 from Products.CMFTopic.AbstractCriterion import AbstractCriterion
@@ -28,6 +28,7 @@
 
 _as_of = DateTime  # Allow for controlled value when testing
 
+
 class FriendlyDateCriterion( AbstractCriterion ):
 
     """

Modified: Products.CMFTopic/trunk/Products/CMFTopic/ListCriterion.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/ListCriterion.py	2009-01-03 16:28:03 UTC (rev 94488)
+++ Products.CMFTopic/trunk/Products/CMFTopic/ListCriterion.py	2009-01-03 16:28:19 UTC (rev 94489)
@@ -16,7 +16,7 @@
 """
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from zope.interface import implements
 
 from Products.CMFTopic.AbstractCriterion import AbstractCriterion

Modified: Products.CMFTopic/trunk/Products/CMFTopic/SimpleIntCriterion.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/SimpleIntCriterion.py	2009-01-03 16:28:03 UTC (rev 94488)
+++ Products.CMFTopic/trunk/Products/CMFTopic/SimpleIntCriterion.py	2009-01-03 16:28:19 UTC (rev 94489)
@@ -16,7 +16,7 @@
 """
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from zope.interface import implements
 
 from Products.CMFTopic.AbstractCriterion import AbstractCriterion

Modified: Products.CMFTopic/trunk/Products/CMFTopic/SimpleStringCriterion.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/SimpleStringCriterion.py	2009-01-03 16:28:03 UTC (rev 94488)
+++ Products.CMFTopic/trunk/Products/CMFTopic/SimpleStringCriterion.py	2009-01-03 16:28:19 UTC (rev 94489)
@@ -16,7 +16,7 @@
 """
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from zope.interface import implements
 
 from Products.CMFTopic.AbstractCriterion import AbstractCriterion

Modified: Products.CMFTopic/trunk/Products/CMFTopic/SortCriterion.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/SortCriterion.py	2009-01-03 16:28:03 UTC (rev 94488)
+++ Products.CMFTopic/trunk/Products/CMFTopic/SortCriterion.py	2009-01-03 16:28:19 UTC (rev 94489)
@@ -16,7 +16,7 @@
 """
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from zope.interface import implements
 
 from Products.CMFTopic.AbstractCriterion import AbstractCriterion

Modified: Products.CMFTopic/trunk/Products/CMFTopic/Topic.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/Topic.py	2009-01-03 16:28:03 UTC (rev 94488)
+++ Products.CMFTopic/trunk/Products/CMFTopic/Topic.py	2009-01-03 16:28:19 UTC (rev 94489)
@@ -17,22 +17,20 @@
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import aq_parent, aq_inner
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from zope.component import getUtility
 from zope.component.factory import Factory
 from zope.interface import implements
 
-from Products.CMFDefault.SkinnedFolder import SkinnedFolder
 from Products.CMFCore.interfaces import ISyndicationTool
 from Products.CMFCore.utils import getToolByName
-
+from Products.CMFDefault.SkinnedFolder import SkinnedFolder
 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):
     """ Create an empty topic.
     """

Modified: Products.CMFTopic/trunk/Products/CMFTopic/tests/test_Topic.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/tests/test_Topic.py	2009-01-03 16:28:03 UTC (rev 94488)
+++ Products.CMFTopic/trunk/Products/CMFTopic/tests/test_Topic.py	2009-01-03 16:28:19 UTC (rev 94489)
@@ -32,8 +32,6 @@
 from Products.CMFCore.testing import EventZCMLLayer
 from Products.CMFCore.tests.base.dummy import DummySite
 from Products.CMFCore.tests.base.testcase import SecurityTest
-from Products.CMFCore.TypesTool import FactoryTypeInformation as FTI
-from Products.CMFCore.TypesTool import TypesTool
 from Products.CMFTopic.testing import FunctionalLayer