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

[Yvo Schubbe]

Log message for revision 94492:
  - import cleanup

Changed:
  U   Products.GenericSetup/trunk/Products/GenericSetup/context.py
  U   Products.GenericSetup/trunk/Products/GenericSetup/differ.py
  U   Products.GenericSetup/trunk/Products/GenericSetup/registry.py
  U   Products.GenericSetup/trunk/Products/GenericSetup/rolemap.py
  U   Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py
  U   Products.GenericSetup/trunk/Products/GenericSetup/tests/test_profile_metadata.py
  U   Products.GenericSetup/trunk/Products/GenericSetup/tool.py
  U   Products.GenericSetup/trunk/Products/GenericSetup/utils.py

-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/context.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/context.py	2009-01-03 16:28:52 UTC (rev 94491)
+++ Products.GenericSetup/trunk/Products/GenericSetup/context.py	2009-01-03 16:29:08 UTC (rev 94492)
@@ -29,8 +29,8 @@
 from Acquisition import aq_parent
 from Acquisition import aq_self
 from Acquisition import Implicit
+from App.class_init import InitializeClass
 from DateTime.DateTime import DateTime
-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

Modified: Products.GenericSetup/trunk/Products/GenericSetup/differ.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/differ.py	2009-01-03 16:28:52 UTC (rev 94491)
+++ Products.GenericSetup/trunk/Products/GenericSetup/differ.py	2009-01-03 16:29:08 UTC (rev 94492)
@@ -19,7 +19,7 @@
 import re
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 
 from Products.GenericSetup.interfaces import SKIPPED_FILES
 

Modified: Products.GenericSetup/trunk/Products/GenericSetup/registry.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/registry.py	2009-01-03 16:28:52 UTC (rev 94491)
+++ Products.GenericSetup/trunk/Products/GenericSetup/registry.py	2009-01-03 16:29:08 UTC (rev 94492)
@@ -14,13 +14,13 @@
 
 $Id$
 """
-import os
+
 from xml.sax import parseString
 from xml.sax.handler import ContentHandler
 
 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 Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from zope.interface import implements
 

Modified: Products.GenericSetup/trunk/Products/GenericSetup/rolemap.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/rolemap.py	2009-01-03 16:28:52 UTC (rev 94491)
+++ Products.GenericSetup/trunk/Products/GenericSetup/rolemap.py	2009-01-03 16:29:08 UTC (rev 94492)
@@ -17,7 +17,7 @@
 
 from AccessControl.Permission import Permission
 from AccessControl.SecurityInfo import ClassSecurityInfo
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 
 from Products.GenericSetup.permissions import ManagePortal

Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py	2009-01-03 16:28:52 UTC (rev 94491)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_components.py	2009-01-03 16:29:08 UTC (rev 94492)
@@ -20,7 +20,7 @@
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import aq_base
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from OFS.Folder import Folder
 from OFS.SimpleItem import SimpleItem
 from Products.Five.component import enableSite

Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_profile_metadata.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_profile_metadata.py	2009-01-03 16:28:52 UTC (rev 94491)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_profile_metadata.py	2009-01-03 16:29:08 UTC (rev 94492)
@@ -14,9 +14,8 @@
 
 $Id$
 """
-import unittest
-import os
 
+import unittest
 from Testing.ZopeTestCase import ZopeTestCase
 from Testing.ZopeTestCase import installProduct
 

Modified: Products.GenericSetup/trunk/Products/GenericSetup/tool.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tool.py	2009-01-03 16:28:52 UTC (rev 94491)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tool.py	2009-01-03 16:29:08 UTC (rev 94492)
@@ -22,7 +22,7 @@
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import aq_base
-from App.class_init import default__class_init__ as InitializeClass
+from App.class_init import InitializeClass
 from OFS.Folder import Folder
 from OFS.Image import File
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile

Modified: Products.GenericSetup/trunk/Products/GenericSetup/utils.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/utils.py	2009-01-03 16:28:52 UTC (rev 94491)
+++ Products.GenericSetup/trunk/Products/GenericSetup/utils.py	2009-01-03 16:29:08 UTC (rev 94492)
@@ -28,7 +28,7 @@
 
 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 App.Common import package_home
 from OFS.interfaces import IOrderedContainer
 from Products.Five.utilities.interfaces import IMarkerInterfaces