[CMF-checkins] CVS: Products/CMFDefault - DublinCore.py:1.34 SyndicationTool.py:1.25 utils.py:1.25

[Yvo Schubbe]

Update of /cvs-repository/Products/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv28316/CMFDefault

Modified Files:
	DublinCore.py SyndicationTool.py utils.py 
Log Message:
- some import and whitespace cleanup


=== Products/CMFDefault/DublinCore.py 1.33 => 1.34 ===
--- Products/CMFDefault/DublinCore.py:1.33	Thu Apr 29 12:13:17 2004
+++ Products/CMFDefault/DublinCore.py	Tue Jul 13 12:49:39 2004
@@ -26,7 +26,6 @@
 from Products.CMFCore.interfaces.DublinCore import DublinCore
 from Products.CMFCore.interfaces.DublinCore import MutableDublinCore
 from Products.CMFCore.utils import getToolByName
-from Products.CMFCore.WorkflowCore import WorkflowAction
 
 from permissions import ModifyPortalContent
 from permissions import View


=== Products/CMFDefault/SyndicationTool.py 1.24 => 1.25 ===
--- Products/CMFDefault/SyndicationTool.py:1.24	Wed May  5 10:18:24 2004
+++ Products/CMFDefault/SyndicationTool.py	Tue Jul 13 12:49:39 2004
@@ -32,7 +32,6 @@
 from Products.CMFCore.utils import UniqueObject
 
 from exceptions import AccessControl_Unauthorized
-from permissions import AccessContentsInformation
 from permissions import ManagePortal
 from permissions import ManageProperties
 from SyndicationInfo import SyndicationInformation


=== Products/CMFDefault/utils.py 1.24 => 1.25 ===
--- Products/CMFDefault/utils.py:1.24	Thu Apr 29 12:13:18 2004
+++ Products/CMFDefault/utils.py	Tue Jul 13 12:49:39 2004
@@ -19,17 +19,14 @@
 import re
 from cgi import escape
 from sgmllib import SGMLParser
-from types import ListType
-from types import StringType
-from types import TupleType
-from types import UnicodeType
 
-from Globals import package_home
 from AccessControl import ModuleSecurityInfo
+from Globals import package_home
 from ZTUtils.Zope import complex_marshal
 
 from exceptions import IllegalHTML
 
+
 security = ModuleSecurityInfo( 'Products.CMFDefault.utils' )
 
 security.declarePrivate('_dtmldir')
@@ -142,10 +139,10 @@
 def seq_strip(seq, stripper=lambda x: x.strip() ):
     """ Strip a sequence of strings.
     """
-    if isinstance(seq, ListType):
+    if isinstance(seq, list):
         return map( stripper, seq )
 
-    if isinstance(seq, TupleType):
+    if isinstance(seq, tuple):
         return tuple( map( stripper, seq ) )
 
     raise ValueError, "%s of unsupported sequencetype %s" % ( seq, type( seq ) )
@@ -153,13 +150,13 @@
 security.declarePublic('tuplize')
 def tuplize( valueName, value, splitter=lambda x: x.split() ):
 
-    if isinstance(value, TupleType):
+    if isinstance(value, tuple):
         return seq_strip( value )
 
-    if isinstance(value, ListType):
+    if isinstance(value, list):
         return seq_strip( tuple( value ) )
 
-    if isinstance(value, StringType) or isinstance(value, UnicodeType):
+    if isinstance(value, basestring):
         return seq_strip( tuple( splitter( value ) ) )
 
     raise ValueError, "%s of unsupported type" % valueName