From 4ea5f370eb52e0f29b1ee55d8aae9167c332a5a3 Mon Sep 17 00:00:00 2001 From: David Halter Date: Mon, 7 Oct 2013 23:50:27 +0430 Subject: [PATCH] use GlobalNamespace differently --- jedi/api.py | 4 ++-- jedi/imports.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jedi/api.py b/jedi/api.py index a6f3dd3f..0ada4e9c 100644 --- a/jedi/api.py +++ b/jedi/api.py @@ -377,7 +377,7 @@ class Script(object): scopes |= keywords.keywords(string=goto_path, pos=self._pos) d = set([api_classes.Definition(s) for s in scopes - if not isinstance(s, imports.ImportPath._GlobalNamespace)]) + if s is not imports.ImportPath.GlobalNamespace]) return self._sorted_defs(d) @api_classes._clear_caches_after_call @@ -392,7 +392,7 @@ class Script(object): """ results, _ = self._goto() d = [api_classes.Definition(d) for d in set(results) - if not isinstance(d, imports.ImportPath._GlobalNamespace)] + if d is not imports.ImportPath.GlobalNamespace] return self._sorted_defs(d) def _goto(self, add_import_name=False): diff --git a/jedi/imports.py b/jedi/imports.py index e187f265..1e132b30 100644 --- a/jedi/imports.py +++ b/jedi/imports.py @@ -39,11 +39,11 @@ class ImportPath(pr.Base): """ An ImportPath is the path of a `pr.Import` object. """ - class _GlobalNamespace(object): + class GlobalNamespace(object): def __init__(self): self.line_offset = 0 - GlobalNamespace = _GlobalNamespace() + GlobalNamespace = GlobalNamespace() def __init__(self, import_stmt, is_like_search=False, kill_count=0, direct_resolve=False, is_just_from=False):