From 1c27759c4fcd39797cdf596906c67948d5364f84 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Tue, 21 Oct 2014 13:54:03 +0200 Subject: [PATCH] Few fixes. --- jedi/evaluate/helpers.py | 9 +++++---- jedi/parser/representation.py | 5 ++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/jedi/evaluate/helpers.py b/jedi/evaluate/helpers.py index 0d4b375e..06ead89d 100644 --- a/jedi/evaluate/helpers.py +++ b/jedi/evaluate/helpers.py @@ -141,7 +141,8 @@ def call_signature_array_for_pos(stmt, pos): return None, 0, None tup = None, 0, None - for command in stmt.expression_list(): + # TODO this is still old + for command in [] and stmt.expression_list(): if isinstance(command, pr.Array): tup = search_array(command, pos) elif isinstance(command, pr.StatementElement): @@ -293,10 +294,10 @@ class FakeArray(pr.Array): class FakeStatement(pr.ExprStmt): - def __init__(self, expression_list, start_pos=(0, 0), parent=None): + def __init__(self, values, start_pos=(0, 0), parent=None): p = start_pos - super(FakeStatement, self).__init__(FakeSubModule, expression_list, p, p) - self.set_expression_list(expression_list) + super(FakeStatement, self).__init__([]) + self.values = values self.parent = parent diff --git a/jedi/parser/representation.py b/jedi/parser/representation.py index e81bf670..a0c9c09c 100644 --- a/jedi/parser/representation.py +++ b/jedi/parser/representation.py @@ -653,7 +653,10 @@ class Class(Scope): if len(self.children) == 4: # Has no parentheses return None else: - return self.children[3] + if self.children[3] == ')': # Empty parentheses + return None + else: + return self.children[3] @property def name(self):