Fix decorator issues with nested decorators and class combinations. Fixes #642.

2016-07-17 23:54:47 +02:00
parent 4b0e164d91
commit 20529d3405
2 changed files with 11 additions and 1 deletions
--- a/jedi/evaluate/representation.py
+++ b/jedi/evaluate/representation.py
@@ -553,8 +553,10 @@ class Function(use_metaclass(CachedMetaClass, Wrapper)):
                # Create param array.
                if isinstance(f, Function):
                    old_func = f  # TODO this is just hacky. change.
-                else:
+                elif f.type == 'funcdef':
                    old_func = Function(self._evaluator, f, is_decorated=True)
+                else:
+                    old_func = f

                wrappers = self._evaluator.execute_evaluated(decorator, old_func)
                if not len(wrappers):