Merge pull request #502 from berrange/callable

runtime: avoid assumption that all objects provide __call__
pallets · Jul 7, 2017 · 07c0b87 · 07c0b87
2 parents e276843 + 91255f8
commit 07c0b87
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/jinja2/runtime.py b/jinja2/runtime.py
@@ -242,13 +242,14 @@ def call(__self, __obj, *args, **kwargs):
             __traceback_hide__ = True  # noqa
 
         # Allow callable classes to take a context
-        fn = __obj.__call__
-        for fn_type in ('contextfunction',
-                        'evalcontextfunction',
-                        'environmentfunction'):
-            if hasattr(fn, fn_type):
-                __obj = fn
-                break
+        if hasattr(__obj, '__call__'):
+            fn = __obj.__call__
+            for fn_type in ('contextfunction',
+                            'evalcontextfunction',
+                            'environmentfunction'):
+                if hasattr(fn, fn_type):
+                    __obj = fn
+                    break
 
         if isinstance(__obj, _context_function_types):
             if getattr(__obj, 'contextfunction', 0):