From 1e259c1c6e1166658dc44a2cfc4b79d207b44367 Mon Sep 17 00:00:00 2001 From: David Halter Date: Sat, 24 Nov 2012 17:42:52 +0100 Subject: [PATCH] none positions shouldn't be an option, (0, 0) is the 'invalid' or 'generated' position for objects that are always found --- jedi/evaluate.py | 6 +++++- jedi/imports.py | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/jedi/evaluate.py b/jedi/evaluate.py index 532e33af..3f0284b6 100644 --- a/jedi/evaluate.py +++ b/jedi/evaluate.py @@ -949,8 +949,12 @@ def get_defined_names_for_position(scope, position=None, start_scope=None): return names names_new = [] for n in names: - if n.start_pos < position: + try: + if n.start_pos[0] is not None and n.start_pos < position: names_new.append(n) + except: + print(n, position, n.parent()) + raise return names_new diff --git a/jedi/imports.py b/jedi/imports.py index ec38c398..d23f0208 100644 --- a/jedi/imports.py +++ b/jedi/imports.py @@ -80,8 +80,8 @@ class ImportPath(parsing.Base): """ i = self.import_stmt # This is not an existing Import statement. Therefore, set position to - # None. - zero = (None, None) + # 0 (0 is not a valid line number). + zero = (0, 0) n = parsing.Name(i.namespace.names[1:], zero, zero, self.import_stmt) new = parsing.Import(zero, zero, n) new.parent = weakref.ref(parent)