Commit 344e7842 authored by Vincent Pelletier's avatar Vincent Pelletier

Do not use "dict" as a variable name, since it's also a type.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19290 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d0524a36
...@@ -34,9 +34,9 @@ def mergedLocalRoles(object): ...@@ -34,9 +34,9 @@ def mergedLocalRoles(object):
object = getattr(object, 'aq_inner', object) object = getattr(object, 'aq_inner', object)
while 1: while 1:
if hasattr(object, '__ac_local_roles__'): if hasattr(object, '__ac_local_roles__'):
dict = object.__ac_local_roles__ or {} roles = object.__ac_local_roles__ or {}
if callable(dict): dict = dict() if callable(roles): roles = roles()
for k, v in dict.items(): for k, v in roles.items():
if merged.has_key(k): if merged.has_key(k):
merged[k] = merged[k] + v merged[k] = merged[k] + v
else: else:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment