[Erp5-report] r24675 - in /erp5/trunk/products/ERP5: Document/ tests/

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Nov 24 18:38:16 2008
New Revision: 24675

URL: http://svn.erp5.org?rev=24675&view=rev
Log:
when importing PortalTypeRoleTemplateItem, the role must be a string

Modified:
    erp5/trunk/products/ERP5/Document/BusinessTemplate.py
    erp5/trunk/products/ERP5/tests/testBusinessTemplate.py

Modified: erp5/trunk/products/ERP5/Document/BusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BusinessTemplate.py?rev=24675&r1=24674&r2=24675&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] Mon Nov 24 18:38:16 2008
@@ -2371,7 +2371,7 @@
     xml = parse(file)
     xml_type_roles_list = xml.getElementsByTagName('role')
     for role in xml_type_roles_list:
-      id = role.getAttribute('id')
+      id = role.getAttribute('id').encode('utf_8', 'backslashreplace')
       type_role_property_dict = {'id':id}
       # uniq
       property_list = role.getElementsByTagName('property')

Modified: erp5/trunk/products/ERP5/tests/testBusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testBusinessTemplate.py?rev=24675&r1=24674&r2=24675&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testBusinessTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testBusinessTemplate.py [utf8] Mon Nov 24 18:38:16 2008
@@ -4970,6 +4970,8 @@
     self.assertEquals(('group/g1','function/f1'), role.getCategory())
     self.assertEquals(('group','site'), role.getBaseCategory())
     self.assertEquals('Base Category Script', role.getBaseCategoryScript())
+    # role name is a string, not unicode
+    self.assertTrue(isinstance(role.id, str))
 
   def test_36_CheckPortalTypeRoles(self, quiet=quiet, run=run_all_test):
     if not run: return