[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/workflow/stateful/xmlimportexport.py workflow bugfix:

[Dominik Huber]

Log message for revision 24955:
workflow bugfix: 
- fixed relevantDataSchema return unproxied schema
- fixed getPermissionId return permission.id


-=-
Modified: Zope3/trunk/src/zope/app/workflow/stateful/xmlimportexport.py
===================================================================
--- Zope3/trunk/src/zope/app/workflow/stateful/xmlimportexport.py	2004-05-25 03:53:54 UTC (rev 24954)
+++ Zope3/trunk/src/zope/app/workflow/stateful/xmlimportexport.py	2004-05-25 08:24:24 UTC (rev 24955)
@@ -171,13 +171,14 @@
         return IZopeDublinCore(obj)
 
     def getPermissionId(self, permission):
-        if isinstance(permission, str):
+        if isinstance(permission, str) or isinstance(permission, unicode):
             return permission
         if permission is CheckerPublic:
             return 'zope.Public'
         if permission is None:
             return ''
-        return removeAllProxies(permission)
+        permission = removeAllProxies(permission)
+        return permission.id
 
     def getSchemaPermissions(self):
         info = []
@@ -192,7 +193,7 @@
         return info
 
     def relevantDataSchema(self):
-        schema = self.context.relevantDataSchema
+        schema = removeAllProxies(self.context.relevantDataSchema)
         if schema is None:
             return 'None'
         return schema.__module__ + '.' + schema.getName()