[Checkins] SVN: CMF/trunk/ - import cleanup

[Yvo Schubbe]

Log message for revision 71021:
  - import cleanup

Changed:
  U   CMF/trunk/CMFActionIcons/exportimport.py
  U   CMF/trunk/CMFCore/exportimport/content.py
  U   CMF/trunk/CMFCore/exportimport/skins.py
  U   CMF/trunk/CMFCore/exportimport/tests/test_content.py
  U   CMF/trunk/CMFCore/exportimport/typeinfo.py
  U   CMF/trunk/CMFCore/exportimport/workflow.py
  U   CMF/trunk/CMFCore/fiveactionstool.py
  U   CMF/trunk/CMFDefault/Image.py
  U   CMF/trunk/CMFDefault/RegistrationTool.py
  U   CMF/trunk/CMFDefault/browser/link.py
  U   CMF/trunk/CMFDefault/browser/utils.py
  U   CMF/trunk/CMFTopic/exportimport.py
  U   CMF/trunk/CMFTopic/tests/test_Topic.py
  U   CMF/trunk/DCWorkflow/ContainerTab.py

-=-
Modified: CMF/trunk/CMFActionIcons/exportimport.py
===================================================================
--- CMF/trunk/CMFActionIcons/exportimport.py	2006-11-01 15:42:13 UTC (rev 71020)
+++ CMF/trunk/CMFActionIcons/exportimport.py	2006-11-01 16:23:56 UTC (rev 71021)
@@ -14,16 +14,15 @@
 
 $Id$
 """
+
 import os
 
 from AccessControl import ClassSecurityInfo
-from AccessControl.Permission import Permission
 from Globals import InitializeClass
 from Globals import package_home
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 
 from Products.CMFCore.utils import getToolByName
-
 from Products.GenericSetup.utils import CONVERTER
 from Products.GenericSetup.utils import DEFAULT
 from Products.GenericSetup.utils import ExportConfiguratorBase

Modified: CMF/trunk/CMFCore/exportimport/content.py
===================================================================
--- CMF/trunk/CMFCore/exportimport/content.py	2006-11-01 15:42:13 UTC (rev 71020)
+++ CMF/trunk/CMFCore/exportimport/content.py	2006-11-01 16:23:56 UTC (rev 71021)
@@ -14,16 +14,11 @@
 
 $Id$
 """
-try:
-    set = set
-except NameError:
-    from sets import Set as set
 
 from csv import reader
 from csv import register_dialect
 from csv import writer
 from ConfigParser import ConfigParser
-import re
 from StringIO import StringIO
 
 from zope.interface import implements
@@ -209,4 +204,3 @@
             content.setDescription(description)
 
         return content
-

Modified: CMF/trunk/CMFCore/exportimport/skins.py
===================================================================
--- CMF/trunk/CMFCore/exportimport/skins.py	2006-11-01 15:42:13 UTC (rev 71020)
+++ CMF/trunk/CMFCore/exportimport/skins.py	2006-11-01 16:23:56 UTC (rev 71021)
@@ -26,7 +26,6 @@
 from Products.GenericSetup.utils import ObjectManagerHelpers
 from Products.GenericSetup.utils import XMLAdapterBase
 
-from Products.CMFCore.DirectoryView import createDirectoryView
 from Products.CMFCore.interfaces import IDirectoryView
 from Products.CMFCore.interfaces import ISkinsTool
 from Products.CMFCore.utils import getToolByName

Modified: CMF/trunk/CMFCore/exportimport/tests/test_content.py
===================================================================
--- CMF/trunk/CMFCore/exportimport/tests/test_content.py	2006-11-01 15:42:13 UTC (rev 71020)
+++ CMF/trunk/CMFCore/exportimport/tests/test_content.py	2006-11-01 16:23:56 UTC (rev 71021)
@@ -27,9 +27,7 @@
 from Products.GenericSetup.tests.common import DummyExportContext
 from Products.GenericSetup.tests.common import DummyImportContext
 
-from conformance import ConformsToIFilesystemImporter
 
-
 class SiteStructureExporterTests(unittest.TestCase):
 
     def _getExporter(self):

Modified: CMF/trunk/CMFCore/exportimport/typeinfo.py
===================================================================
--- CMF/trunk/CMFCore/exportimport/typeinfo.py	2006-11-01 15:42:13 UTC (rev 71020)
+++ CMF/trunk/CMFCore/exportimport/typeinfo.py	2006-11-01 16:23:56 UTC (rev 71021)
@@ -15,9 +15,6 @@
 $Id$
 """
 
-from xml.dom.minidom import parseString
-
-import Products
 from zope.component import adapts
 
 from Products.GenericSetup.interfaces import ISetupEnviron

Modified: CMF/trunk/CMFCore/exportimport/workflow.py
===================================================================
--- CMF/trunk/CMFCore/exportimport/workflow.py	2006-11-01 15:42:13 UTC (rev 71020)
+++ CMF/trunk/CMFCore/exportimport/workflow.py	2006-11-01 16:23:56 UTC (rev 71021)
@@ -15,7 +15,6 @@
 $Id$
 """
 
-import Products
 from zope.component import adapts
 
 from Products.GenericSetup.interfaces import ISetupEnviron

Modified: CMF/trunk/CMFCore/fiveactionstool.py
===================================================================
--- CMF/trunk/CMFCore/fiveactionstool.py	2006-11-01 15:42:13 UTC (rev 71020)
+++ CMF/trunk/CMFCore/fiveactionstool.py	2006-11-01 16:23:56 UTC (rev 71021)
@@ -15,9 +15,7 @@
 $Id$
 """
 
-import zope.thread
 from AccessControl import ClassSecurityInfo
-from Acquisition import aq_base
 from Globals import InitializeClass
 from OFS.SimpleItem import SimpleItem
 from Products.Five import security

Modified: CMF/trunk/CMFDefault/Image.py
===================================================================
--- CMF/trunk/CMFDefault/Image.py	2006-11-01 15:42:13 UTC (rev 71020)
+++ CMF/trunk/CMFDefault/Image.py	2006-11-01 16:23:56 UTC (rev 71021)
@@ -18,7 +18,6 @@
 
 import OFS.Image
 from AccessControl import ClassSecurityInfo
-from DateTime.DateTime import DateTime
 from Globals import InitializeClass
 from zope.component.factory import Factory
 from zope.interface import implements

Modified: CMF/trunk/CMFDefault/RegistrationTool.py
===================================================================
--- CMF/trunk/CMFDefault/RegistrationTool.py	2006-11-01 15:42:13 UTC (rev 71020)
+++ CMF/trunk/CMFDefault/RegistrationTool.py	2006-11-01 16:23:56 UTC (rev 71021)
@@ -15,8 +15,6 @@
 $Id$
 """
 
-import re
-
 from AccessControl import ClassSecurityInfo
 from Acquisition import aq_base
 from Globals import InitializeClass

Modified: CMF/trunk/CMFDefault/browser/link.py
===================================================================
--- CMF/trunk/CMFDefault/browser/link.py	2006-11-01 15:42:13 UTC (rev 71020)
+++ CMF/trunk/CMFDefault/browser/link.py	2006-11-01 16:23:56 UTC (rev 71021)
@@ -15,8 +15,6 @@
 $Id$
 """
 
-import urlparse
-
 from Products.CMFDefault.exceptions import ResourceLockedError
 from Products.CMFDefault.utils import Message as _
 

Modified: CMF/trunk/CMFDefault/browser/utils.py
===================================================================
--- CMF/trunk/CMFDefault/browser/utils.py	2006-11-01 15:42:13 UTC (rev 71020)
+++ CMF/trunk/CMFDefault/browser/utils.py	2006-11-01 16:23:56 UTC (rev 71021)
@@ -16,7 +16,6 @@
 """
 
 from AccessControl.SecurityInfo import ClassSecurityInfo
-from DateTime.DateTime import DateTime
 from Globals import InitializeClass
 from Products.Five import BrowserView
 from Products.PythonScripts.standard import thousands_commas

Modified: CMF/trunk/CMFTopic/exportimport.py
===================================================================
--- CMF/trunk/CMFTopic/exportimport.py	2006-11-01 15:42:13 UTC (rev 71020)
+++ CMF/trunk/CMFTopic/exportimport.py	2006-11-01 16:23:56 UTC (rev 71021)
@@ -14,9 +14,9 @@
 
 $Id$
 """
+
 from xml.dom.minidom import parseString
 
-from Acquisition import Implicit
 from zope.interface import implements
 
 from Products.GenericSetup.interfaces import IFilesystemExporter
@@ -158,4 +158,3 @@
         topic = Topic(id)
         topic.portal_type = 'Topic'
         return topic
-

Modified: CMF/trunk/CMFTopic/tests/test_Topic.py
===================================================================
--- CMF/trunk/CMFTopic/tests/test_Topic.py	2006-11-01 15:42:13 UTC (rev 71020)
+++ CMF/trunk/CMFTopic/tests/test_Topic.py	2006-11-01 16:23:56 UTC (rev 71021)
@@ -83,7 +83,6 @@
 
     def searchResults( self, REQUEST=None, **kw ):
 
-        from sets import Set
         limit = None
 
         criteria = kw.copy()
@@ -92,7 +91,7 @@
             for k, v in REQUEST:
                 criteria[ k ] = v
 
-        results = Set( range( len( self._objects ) ) )
+        results = set(range(len(self._objects)))
 
         for k, v in criteria.items():
 
@@ -100,9 +99,8 @@
                 limit = v
 
             else:
-                results &= Set( self._indexes[ k ].get( v, [] ) )
+                results &= set(self._indexes[k].get(v, []))
 
-
         results = [ x for x in results ]
 
         if limit is not None:

Modified: CMF/trunk/DCWorkflow/ContainerTab.py
===================================================================
--- CMF/trunk/DCWorkflow/ContainerTab.py	2006-11-01 15:42:13 UTC (rev 71020)
+++ CMF/trunk/DCWorkflow/ContainerTab.py	2006-11-01 16:23:56 UTC (rev 71021)
@@ -15,14 +15,14 @@
 $Id$
 """
 
-from OFS.Folder import Folder
-from OFS.SimpleItem import Item_w__name__
 from Acquisition import aq_base, aq_inner, aq_parent
+from OFS.Folder import Folder
 
 _marker = []  # Create a new marker object.
 
-class ContainerTab (Folder):
 
+class ContainerTab(Folder):
+
     def __init__(self, id):
         self.id = id
         self._mapping = {}
@@ -116,4 +116,3 @@
         if REQUEST is not None:
             return self.manage_main(REQUEST)
         return None
-