[Erp5-report] r26091 - /erp5/trunk/products/ERP5Type/Utils.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Mar 18 17:15:53 2009
New Revision: 26091

URL: http://svn.erp5.org?rev=26091&view=rev
Log:
a bit cleanup of the code.

Modified:
    erp5/trunk/products/ERP5Type/Utils.py

Modified: erp5/trunk/products/ERP5Type/Utils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Utils.py?rev=26091&r1=26090&r2=26091&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Utils.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Utils.py [utf8] Wed Mar 18 17:15:53 2009
@@ -41,6 +41,7 @@
 from Acquisition import aq_parent
 from Acquisition import aq_self
 
+from AccessControl import ModuleSecurityInfo
 from AccessControl.SecurityInfo import allow_class
 
 from Products.CMFCore import utils
@@ -276,7 +277,7 @@
 
 #Get message id for translation
 def getMessageIdWithContext(msg_id, context, context_id):
-  return '%s [%s in %s]' % (msg_id,context,context_id)
+  return '%s [%s in %s]' % (msg_id, context, context_id)
 
 #Get translation of msg id
 def getTranslationStringWithContext(self, msg_id, context, context_id):
@@ -284,16 +285,15 @@
    portal_workflow = portal.portal_workflow
    localizer = portal.Localizer
    selected_language = localizer.get_selected_language()
-   msg_id_context = getMessageIdWithContext(msg_id,context, context_id)
+   msg_id_context = getMessageIdWithContext(msg_id, context, context_id)
    result = localizer.erp5_ui.gettext(
-               msg_id_context,default='')   
+               msg_id_context, default='')   
    if result == '':
      result = localizer.erp5_ui.gettext(msg_id)
    return result.encode('utf8')
-from AccessControl import ModuleSecurityInfo
+
 ModuleSecurityInfo('Products.ERP5Type.Utils').declarePublic(
-'getMessageIdForWorkflowState','getTranslationStringWithContext',
-'getMessageIdWithContext' )
+  'getMessageIdWithContext', 'getTranslationStringWithContext')
 
 #####################################################
 # Globals initialization
@@ -801,7 +801,6 @@
     setattr(Products.ERP5Type.Document, document_constructor_name,
                                       document_constructor)
     setDefaultClassProperties(document_class)
-    from AccessControl import ModuleSecurityInfo
     ModuleSecurityInfo('Products.ERP5Type.Document').declareProtected(
         Permissions.AddPortalContent, document_constructor_name,)
     InitializeClass(document_class)