[Erp5-report] r19290 - /erp5/trunk/products/ERP5Security/__init__.py

[nobody at svn.erp5.org]

Author: vincent
Date: Wed Feb 13 09:37:29 2008
New Revision: 19290

URL: http://svn.erp5.org?rev=19290&view=rev
Log:
Do not use "dict" as a variable name, since it's also a type.

Modified:
    erp5/trunk/products/ERP5Security/__init__.py

Modified: erp5/trunk/products/ERP5Security/__init__.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Security/__init__.py?rev=19290&r1=19289&r2=19290&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Security/__init__.py (original)
+++ erp5/trunk/products/ERP5Security/__init__.py Wed Feb 13 09:37:29 2008
@@ -34,9 +34,9 @@
     object = getattr(object, 'aq_inner', object)
     while 1:
         if hasattr(object, '__ac_local_roles__'):
-            dict = object.__ac_local_roles__ or {}
-            if callable(dict): dict = dict()
-            for k, v in dict.items():
+            roles = object.__ac_local_roles__ or {}
+            if callable(roles): roles = roles()
+            for k, v in roles.items():
                 if merged.has_key(k):
                     merged[k] = merged[k] + v
                 else: