[Checkins] SVN: Products.DCWorkflow/branches/do3cc_gs17/ Compatibility with proposed GS 1.7

[Patrick Gerken]

Log message for revision 123450:
  Compatibility with proposed GS 1.7
  

Changed:
  A   Products.DCWorkflow/branches/do3cc_gs17/
  U   Products.DCWorkflow/branches/do3cc_gs17/Products/DCWorkflow/exportimport.py
  U   Products.DCWorkflow/branches/do3cc_gs17/setup.py

-=-
Modified: Products.DCWorkflow/branches/do3cc_gs17/Products/DCWorkflow/exportimport.py
===================================================================
--- Products.DCWorkflow/branches/2.2/Products/DCWorkflow/exportimport.py	2011-11-20 18:53:44 UTC (rev 123449)
+++ Products.DCWorkflow/branches/do3cc_gs17/Products/DCWorkflow/exportimport.py	2011-11-21 09:13:20 UTC (rev 123450)
@@ -150,7 +150,7 @@
         return self._extractScripts(self._obj)
 
     security.declareProtected( ManagePortal, 'parseWorkflowXML' )
-    def parseWorkflowXML( self, xml, encoding=None ):
+    def parseWorkflowXML( self, xml, encoding='utf-8' ):
         """ Pseudo API.
         """
         dom = parseString( xml )
@@ -650,7 +650,7 @@
 
     return 'workflows/%s/scripts/%s.%s' % ( wf_dir, script_id, suffix )
 
-def _extractCreationGuard(root, encoding=None) :
+def _extractCreationGuard(root, encoding='utf-8') :
     icc = root.getElementsByTagName('instance-creation-conditions')
     assert len(icc) <= 1
     if icc :
@@ -659,7 +659,7 @@
     else :
         return None
 
-def _extractStateNodes( root, encoding=None ):
+def _extractStateNodes( root, encoding='utf-8' ):
 
     result = []
 
@@ -720,7 +720,7 @@
 
     return result
 
-def _extractTransitionNodes( root, encoding=None ):
+def _extractTransitionNodes( root, encoding='utf-8' ):
 
     result = []
 
@@ -753,7 +753,7 @@
 
     return result
 
-def _extractVariableNodes( root, encoding=None ):
+def _extractVariableNodes( root, encoding='utf-8' ):
 
     result = []
 
@@ -779,7 +779,7 @@
 
     return result
 
-def _extractWorklistNodes( root, encoding=None ):
+def _extractWorklistNodes( root, encoding='utf-8' ):
 
     result = []
 
@@ -798,7 +798,7 @@
 
     return result
 
-def _extractScriptNodes( root, encoding=None ):
+def _extractScriptNodes( root, encoding='utf-8' ):
 
     result = []
 
@@ -829,7 +829,7 @@
 
     return result
 
-def _extractPermissionNodes( root, encoding=None ):
+def _extractPermissionNodes( root, encoding='utf-8' ):
 
     result = []
 
@@ -839,7 +839,7 @@
 
     return result
 
-def _extractActionNode( parent, encoding=None ):
+def _extractActionNode( parent, encoding='utf-8' ):
 
     nodes = parent.getElementsByTagName( 'action' )
     assert len( nodes ) <= 1, nodes
@@ -855,7 +855,7 @@
            , 'icon' : _queryNodeAttribute( node, 'icon', '', encoding )
            }
 
-def _extractGuardNode( parent, encoding=None ):
+def _extractGuardNode( parent, encoding='utf-8' ):
 
     nodes = parent.getElementsByTagName( 'guard' )
     assert len( nodes ) <= 1, nodes
@@ -882,7 +882,7 @@
            , 'expression' : expr_text
            }
 
-def _extractDefaultNode( parent, encoding=None ):
+def _extractDefaultNode( parent, encoding='utf-8' ):
 
     nodes = parent.getElementsByTagName( 'default' )
     assert len( nodes ) <= 1, nodes
@@ -917,7 +917,7 @@
 
 _SEMICOLON_LIST_SPLITTER = re.compile( r';[ ]*' )
 
-def _extractMatchNode( parent, encoding=None ):
+def _extractMatchNode( parent, encoding='utf-8' ):
 
     nodes = parent.getElementsByTagName( 'match' )
 
@@ -1241,7 +1241,7 @@
 #
 _marker = object()
 
-def _queryNodeAttribute( node, attr_name, default, encoding=None ):
+def _queryNodeAttribute( node, attr_name, default, encoding='utf-8' ):
 
     """ Extract a string-valued attribute from node.
 
@@ -1259,7 +1259,7 @@
 
     return value
 
-def _getNodeAttribute( node, attr_name, encoding=None ):
+def _getNodeAttribute( node, attr_name, encoding='utf-8' ):
 
     """ Extract a string-valued attribute from node.
     """
@@ -1293,7 +1293,7 @@
 
     return value in ( 'true', 'yes', '1' )
 
-def _coalesceTextNodeChildren( node, encoding=None ):
+def _coalesceTextNodeChildren( node, encoding='utf-8' ):
 
     """ Concatenate all childe text nodes into a single string.
     """
@@ -1316,7 +1316,7 @@
 
     return ''.join( [ line.lstrip() for line in joined.splitlines(True) ] ).rstrip()
 
-def _extractDescriptionNode(parent, encoding=None):
+def _extractDescriptionNode(parent, encoding='utf-8'):
 
     d_nodes = parent.getElementsByTagName('description')
     if d_nodes:

Modified: Products.DCWorkflow/branches/do3cc_gs17/setup.py
===================================================================
--- Products.DCWorkflow/branches/2.2/setup.py	2011-11-20 18:53:44 UTC (rev 123449)
+++ Products.DCWorkflow/branches/do3cc_gs17/setup.py	2011-11-21 09:13:20 UTC (rev 123450)
@@ -48,7 +48,7 @@
           'setuptools',
           'Zope2 >= 2.12.0',
           'Products.CMFCore',
-          'Products.GenericSetup',
+          'Products.GenericSetup >= 1.7.0dev',
           ],
       tests_require=[
           'zope.testing >= 3.7.0',