matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check for functions before dictionaries, some lambda functions were being interpreted as dict()

Browse Source
This commit is contained in:
Roberto Rosario
2011-02-09 12:29:26 -04:00
parent 600b94bbda
commit d3d9ac38a1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/common/utils.py
View File

@@ -46,10 +46,10 @@ def urlquote(link=None, get={}):
def return_attrib(obj, attrib, arguments={}): def return_attrib(obj, attrib, arguments={}):
try: try:
if isinstance(obj, types.DictType) or isinstance(obj, types.DictionaryType): if isinstance(attrib, types.FunctionType):
return obj[attrib]
elif isinstance(attrib, types.FunctionType):
return attrib(obj) return attrib(obj)
elif isinstance(obj, types.DictType) or isinstance(obj, types.DictionaryType):
return obj[attrib]
else: else:
result = reduce(getattr, attrib.split("."), obj) result = reduce(getattr, attrib.split("."), obj)
if isinstance(result, types.MethodType): if isinstance(result, types.MethodType):