From d3d9ac38a114cc10d81d526ec1bd3154b78cb3db Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
Date: Wed, 9 Feb 2011 12:29:26 -0400
Subject: [PATCH] Check for functions before dictionaries, some lambda
 functions were being interpreted as dict()

---
 apps/common/utils.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/common/utils.py b/apps/common/utils.py
index b86074ef03..8e4283b812 100644
--- a/apps/common/utils.py
+++ b/apps/common/utils.py
@@ -46,10 +46,10 @@ def urlquote(link=None, get={}):
 
 def return_attrib(obj, attrib, arguments={}):
     try:
-        if isinstance(obj, types.DictType) or isinstance(obj, types.DictionaryType):
-            return obj[attrib]
-        elif isinstance(attrib, types.FunctionType):
+        if isinstance(attrib, types.FunctionType):
             return attrib(obj)
+        elif isinstance(obj, types.DictType) or isinstance(obj, types.DictionaryType):
+            return obj[attrib]
         else:
             result = reduce(getattr, attrib.split("."), obj)
             if isinstance(result, types.MethodType):