[CMF-checkins] CVS: CMF/CMFSetup - rolemap.py:1.11.2.1 tool.py:1.18.2.1 typeinfo.py:1.12.2.1 workflow.py:1.25.2.1

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFSetup
In directory cvs.zope.org:/tmp/cvs-serv28477/CMFSetup

Modified Files:
      Tag: CMF-1_5-branch
	rolemap.py tool.py typeinfo.py workflow.py 
Log Message:
- always propagate the encoding


=== CMF/CMFSetup/rolemap.py 1.11 => 1.11.2.1 ===
--- CMF/CMFSetup/rolemap.py:1.11	Thu Aug 12 11:07:41 2004
+++ CMF/CMFSetup/rolemap.py	Wed Oct  6 06:01:30 2004
@@ -61,6 +61,7 @@
 
     """
     site = context.getSite()
+    encoding = context.getEncoding()
 
     if context.shouldPurge():
 
@@ -79,7 +80,7 @@
     if text is not None:
 
         rc = RolemapConfigurator( site ).__of__( site )
-        roles, permissions = rc.parseXML( text )
+        roles, permissions = rc.parseXML(text, encoding)
 
         immediate_roles = list( getattr( site, '__ac_roles__', [] ) )[:]
         already = {}


=== CMF/CMFSetup/tool.py 1.18 => 1.18.2.1 ===
--- CMF/CMFSetup/tool.py:1.18	Thu Aug 12 11:07:41 2004
+++ CMF/CMFSetup/tool.py	Wed Oct  6 06:01:30 2004
@@ -73,7 +73,7 @@
     setup_tool = getToolByName( site, 'portal_setup' )
     toolset = setup_tool.getToolsetRegistry()
 
-    toolset.parseXML( text )
+    toolset.parseXML(text, encoding)
 
     existing_ids = site.objectIds()
     existing_values = site.objectValues()


=== CMF/CMFSetup/typeinfo.py 1.12 => 1.12.2.1 ===
--- CMF/CMFSetup/typeinfo.py:1.12	Thu Aug 12 11:07:41 2004
+++ CMF/CMFSetup/typeinfo.py	Wed Oct  6 06:01:30 2004
@@ -62,10 +62,10 @@
     configurator = TypeInfoConfigurator( site )
     text = context.readDataFile( _TOOL_FILENAME )
 
-    for type_id, type_filename in configurator.parseToolXML( text ):
+    for type_id, type_filename in configurator.parseToolXML(text, encoding):
 
         text = context.readDataFile( type_filename )
-        info_list = configurator.parseTypeXML( text )
+        info_list = configurator.parseTypeXML(text, encoding)
 
         for info in info_list:
 


=== CMF/CMFSetup/workflow.py 1.25 => 1.25.2.1 ===
--- CMF/CMFSetup/workflow.py:1.25	Thu Aug 12 11:07:41 2004
+++ CMF/CMFSetup/workflow.py	Wed Oct  6 06:01:31 2004
@@ -106,7 +106,7 @@
                 , worklists
                 , permissions
                 , scripts
-                ) = wtc.parseWorkflowXML( wf_text )
+                ) = wtc.parseWorkflowXML(wf_text, encoding)
 
                 workflow_id = str( workflow_id ) # No unicode!