1
0
forked from VimPlug/jedi

Now most decorator tests pass.

This commit is contained in:
Dave Halter
2014-11-17 23:46:05 +01:00
parent f62f181066
commit fd8752f285
2 changed files with 2 additions and 2 deletions

View File

@@ -473,7 +473,7 @@ class Function(use_metaclass(CachedMetaClass, Wrapper)):
if trailer: if trailer:
# Create a trailer and evaluate it. # Create a trailer and evaluate it.
trailer = pr.Node(python_symbols.trailer, trailer) trailer = pr.Node(python_symbols.trailer, trailer)
dec_results = self._evaluator.eval_trailer(trailer) dec_results = self._evaluator.eval_trailer(dec_results, trailer)
if not len(dec_results): if not len(dec_results):
debug.warning('decorator not found: %s on %s', dec, self.base_func) debug.warning('decorator not found: %s on %s', dec, self.base_func)

View File

@@ -548,7 +548,7 @@ class Scope(Simple, DocstringMixin):
if isinstance(s, (ExprStmt, Import))]) if isinstance(s, (ExprStmt, Import))])
elif isinstance(c, (Function, Class)): elif isinstance(c, (Function, Class)):
names.append(c.name) names.append(c.name)
elif isinstance(c, Flow) or is_node(c, 'suite'): elif isinstance(c, Flow) or is_node(c, 'suite', 'decorated'):
names += scan(c.children) names += scan(c.children)
return names return names