From cf4b2c4557c25ebe0a58a50aaad2f327aad79771 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Tue, 24 Dec 2013 16:28:28 +0100 Subject: [PATCH] the whole import thing seems to be working --- jedi/evaluate/__init__.py | 6 +++--- jedi/evaluate/representation.py | 6 +++--- jedi/modules.py | 2 +- jedi/parser/tokenizer.py | 1 + 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py index bdee12fd..8e404a41 100644 --- a/jedi/evaluate/__init__.py +++ b/jedi/evaluate/__init__.py @@ -81,9 +81,9 @@ from jedi import debug from jedi.evaluate import representation as er from jedi.evaluate import builtin from jedi.evaluate import imports -import recursion -import docstrings -import dynamic +from jedi import recursion +from jedi import docstrings +from jedi import dynamic def get_defined_names_for_position(scope, position=None, start_scope=None): diff --git a/jedi/evaluate/representation.py b/jedi/evaluate/representation.py index 2cb08c53..069d7980 100644 --- a/jedi/evaluate/representation.py +++ b/jedi/evaluate/representation.py @@ -22,9 +22,9 @@ from jedi import debug from jedi import common from jedi.evaluate import imports from jedi.evaluate import builtin -import recursion -import docstrings -import dynamic +from jedi import recursion +from jedi import docstrings +from jedi import dynamic class Executable(pr.IsScope): diff --git a/jedi/modules.py b/jedi/modules.py index 4baaf1b6..c603f772 100644 --- a/jedi/modules.py +++ b/jedi/modules.py @@ -16,7 +16,6 @@ Apart from those classes there's a ``sys.path`` fetching function, as well as from __future__ import with_statement import re -import tokenizer as tokenize import sys import os from ast import literal_eval @@ -24,6 +23,7 @@ from ast import literal_eval from jedi._compatibility import exec_function, unicode from jedi import cache from jedi.parser import representation as pr +from jedi.parser import tokenizer as tokenize from jedi.parser import fast from jedi import debug from jedi import common diff --git a/jedi/parser/tokenizer.py b/jedi/parser/tokenizer.py index ea81eefd..689a3e43 100644 --- a/jedi/parser/tokenizer.py +++ b/jedi/parser/tokenizer.py @@ -8,6 +8,7 @@ Basically this is a stripped down version of the standard library module, so you can read the documentation there. """ +from __future__ import absolute_import import string import re from token import *