[Checkins] SVN: CMF/branches/2.1/CMF Some more cleanup, fixed two undefined names.

[Hanno Schlichting]

Log message for revision 77019:
  Some more cleanup, fixed two undefined names.
  

Changed:
  U   CMF/branches/2.1/CMFActionIcons/exportimport.py
  U   CMF/branches/2.1/CMFActionIcons/interfaces/_tools.py
  U   CMF/branches/2.1/CMFCalendar/browser/event.py
  U   CMF/branches/2.1/CMFCalendar/interfaces/_content.py
  U   CMF/branches/2.1/CMFCalendar/interfaces/_tools.py
  U   CMF/branches/2.1/CMFCore/ActionInformation.py
  U   CMF/branches/2.1/CMFCore/FSDTMLMethod.py
  U   CMF/branches/2.1/CMFCore/FSPropertiesObject.py
  U   CMF/branches/2.1/CMFCore/URLTool.py
  U   CMF/branches/2.1/CMFCore/exportimport/cachingpolicymgr.py
  U   CMF/branches/2.1/CMFDefault/Favorite.py

-=-
Modified: CMF/branches/2.1/CMFActionIcons/exportimport.py
===================================================================
--- CMF/branches/2.1/CMFActionIcons/exportimport.py	2007-06-24 18:45:44 UTC (rev 77018)
+++ CMF/branches/2.1/CMFActionIcons/exportimport.py	2007-06-24 19:01:14 UTC (rev 77019)
@@ -23,8 +23,6 @@
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 
 from zope.component import getSiteManager
-from zope.component import getUtility
-from zope.component import queryUtility
 
 from Products.GenericSetup.utils import CONVERTER
 from Products.GenericSetup.utils import DEFAULT

Modified: CMF/branches/2.1/CMFActionIcons/interfaces/_tools.py
===================================================================
--- CMF/branches/2.1/CMFActionIcons/interfaces/_tools.py	2007-06-24 18:45:44 UTC (rev 77018)
+++ CMF/branches/2.1/CMFActionIcons/interfaces/_tools.py	2007-06-24 19:01:14 UTC (rev 77019)
@@ -16,7 +16,6 @@
 """
 
 from zope.interface import Interface
-from zope.interface import Attribute
 
 
 class IActionIconsTool(Interface):

Modified: CMF/branches/2.1/CMFCalendar/browser/event.py
===================================================================
--- CMF/branches/2.1/CMFCalendar/browser/event.py	2007-06-24 18:45:44 UTC (rev 77018)
+++ CMF/branches/2.1/CMFCalendar/browser/event.py	2007-06-24 19:01:14 UTC (rev 77019)
@@ -24,9 +24,7 @@
 from zope.interface import Interface
 from zope.schema import Choice
 from zope.schema import Datetime
-from zope.schema import Field
 from zope.schema import Set
-from zope.schema import Tuple
 from zope.schema import Text
 from zope.schema import TextLine
 from zope.schema import URI

Modified: CMF/branches/2.1/CMFCalendar/interfaces/_content.py
===================================================================
--- CMF/branches/2.1/CMFCalendar/interfaces/_content.py	2007-06-24 18:45:44 UTC (rev 77018)
+++ CMF/branches/2.1/CMFCalendar/interfaces/_content.py	2007-06-24 19:01:14 UTC (rev 77019)
@@ -16,7 +16,6 @@
 """
 
 from zope.interface import Interface
-from zope.interface import Attribute
 
 
 class IEvent(Interface):

Modified: CMF/branches/2.1/CMFCalendar/interfaces/_tools.py
===================================================================
--- CMF/branches/2.1/CMFCalendar/interfaces/_tools.py	2007-06-24 18:45:44 UTC (rev 77018)
+++ CMF/branches/2.1/CMFCalendar/interfaces/_tools.py	2007-06-24 19:01:14 UTC (rev 77019)
@@ -16,7 +16,6 @@
 """
 
 from zope.interface import Interface
-from zope.interface import Attribute
 
 
 class ICalendarTool(Interface):

Modified: CMF/branches/2.1/CMFCore/ActionInformation.py
===================================================================
--- CMF/branches/2.1/CMFCore/ActionInformation.py	2007-06-24 18:45:44 UTC (rev 77018)
+++ CMF/branches/2.1/CMFCore/ActionInformation.py	2007-06-24 19:01:14 UTC (rev 77019)
@@ -37,7 +37,6 @@
 from interfaces.portal_actions import ActionInfo as z2IActionInfo
 from permissions import View
 from utils import _checkPermission
-from utils import _wwwdir
 
 
 _unchanged = [] # marker

Modified: CMF/branches/2.1/CMFCore/FSDTMLMethod.py
===================================================================
--- CMF/branches/2.1/CMFCore/FSDTMLMethod.py	2007-06-24 18:45:44 UTC (rev 77018)
+++ CMF/branches/2.1/CMFCore/FSDTMLMethod.py	2007-06-24 19:01:14 UTC (rev 77019)
@@ -172,7 +172,7 @@
         '''
         ks = []
         for key in keys:
-            key = strip(str(key))
+            key = str(key).strip()
             if key:
                 ks.append(key)
         self._cache_namespace_keys = tuple(ks)

Modified: CMF/branches/2.1/CMFCore/FSPropertiesObject.py
===================================================================
--- CMF/branches/2.1/CMFCore/FSPropertiesObject.py	2007-06-24 18:45:44 UTC (rev 77018)
+++ CMF/branches/2.1/CMFCore/FSPropertiesObject.py	2007-06-24 19:01:14 UTC (rev 77019)
@@ -128,7 +128,7 @@
                             })
             except:
                 raise ValueError, ( 'Error processing line %s of %s:\n%s'
-                                  % (lino,fp,line) )
+                                  % (lino,self._filepath,line) )
         self._properties = tuple(map)
 
     if Globals.DevelopmentMode:

Modified: CMF/branches/2.1/CMFCore/URLTool.py
===================================================================
--- CMF/branches/2.1/CMFCore/URLTool.py	2007-06-24 18:45:44 UTC (rev 77018)
+++ CMF/branches/2.1/CMFCore/URLTool.py	2007-06-24 19:01:14 UTC (rev 77019)
@@ -22,11 +22,9 @@
 from Globals import InitializeClass
 from OFS.SimpleItem import SimpleItem
 
-from zope.component import queryUtility
 from zope.interface import implements
 
 from ActionProviderBase import ActionProviderBase
-from interfaces import ISiteRoot
 from interfaces import IURLTool
 from interfaces.portal_url import portal_url as z2IURLTool
 from permissions import ManagePortal

Modified: CMF/branches/2.1/CMFCore/exportimport/cachingpolicymgr.py
===================================================================
--- CMF/branches/2.1/CMFCore/exportimport/cachingpolicymgr.py	2007-06-24 18:45:44 UTC (rev 77018)
+++ CMF/branches/2.1/CMFCore/exportimport/cachingpolicymgr.py	2007-06-24 19:01:14 UTC (rev 77019)
@@ -16,10 +16,8 @@
 """
 
 from zope.component import adapts
-from zope.component import getUtility
 from zope.component import getSiteManager
 from zope.component import queryMultiAdapter
-from zope.component import queryUtility
 
 from Products.GenericSetup.interfaces import INode
 from Products.GenericSetup.interfaces import ISetupEnviron

Modified: CMF/branches/2.1/CMFDefault/Favorite.py
===================================================================
--- CMF/branches/2.1/CMFDefault/Favorite.py	2007-06-24 18:45:44 UTC (rev 77018)
+++ CMF/branches/2.1/CMFDefault/Favorite.py	2007-06-24 19:01:14 UTC (rev 77019)
@@ -23,7 +23,6 @@
 from zope.app.container.interfaces import IObjectAddedEvent
 from zope.component import adapter
 from zope.component import getUtility
-from zope.component import queryUtility
 from zope.component.factory import Factory
 from zope.interface import implements