From b0ac07228bbdb71e069008fcaf91f39d15ae177e Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Wed, 12 Apr 2017 08:47:30 +0200 Subject: [PATCH] Restructure/Refactor has_absolute_import a bit. --- jedi/parser/python/tree.py | 1 - test/test_evaluate/test_absolute_import.py | 25 ------------------- test/test_parser/test_absolute_import.py | 29 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 26 deletions(-) create mode 100644 test/test_parser/test_absolute_import.py diff --git a/jedi/parser/python/tree.py b/jedi/parser/python/tree.py index 25bbccdd..588dbce3 100644 --- a/jedi/parser/python/tree.py +++ b/jedi/parser/python/tree.py @@ -401,7 +401,6 @@ class Module(Scope): super(Module, self).__init__(children) self._used_names = None - @property def has_explicit_absolute_import(self): """ Checks if imports in this module are explicitly absolute, i.e. there diff --git a/test/test_evaluate/test_absolute_import.py b/test/test_evaluate/test_absolute_import.py index db327b55..418cd567 100644 --- a/test/test_evaluate/test_absolute_import.py +++ b/test/test_evaluate/test_absolute_import.py @@ -3,34 +3,9 @@ Tests ``from __future__ import absolute_import`` (only important for Python 2.X) """ import jedi -from jedi.parser.python import parse from .. import helpers -def test_explicit_absolute_imports(): - """ - Detect modules with ``from __future__ import absolute_import``. - """ - module = parse("from __future__ import absolute_import") - assert module.has_explicit_absolute_import - - -def test_no_explicit_absolute_imports(): - """ - Detect modules without ``from __future__ import absolute_import``. - """ - assert not parse("1").has_explicit_absolute_import - - -def test_dont_break_imports_without_namespaces(): - """ - The code checking for ``from __future__ import absolute_import`` shouldn't - assume that all imports have non-``None`` namespaces. - """ - src = "from __future__ import absolute_import\nimport xyzzy" - assert parse(src).has_explicit_absolute_import - - @helpers.cwd_at("test/test_evaluate/absolute_import") def test_can_complete_when_shadowing(): script = jedi.Script(path="unittest.py") diff --git a/test/test_parser/test_absolute_import.py b/test/test_parser/test_absolute_import.py new file mode 100644 index 00000000..3ba704fb --- /dev/null +++ b/test/test_parser/test_absolute_import.py @@ -0,0 +1,29 @@ +""" +Tests ``from __future__ import absolute_import`` (only important for +Python 2.X) +""" +from jedi.parser.python import parse + + +def test_explicit_absolute_imports(): + """ + Detect modules with ``from __future__ import absolute_import``. + """ + module = parse("from __future__ import absolute_import") + assert module.has_explicit_absolute_import() + + +def test_no_explicit_absolute_imports(): + """ + Detect modules without ``from __future__ import absolute_import``. + """ + assert not parse("1").has_explicit_absolute_import() + + +def test_dont_break_imports_without_namespaces(): + """ + The code checking for ``from __future__ import absolute_import`` shouldn't + assume that all imports have non-``None`` namespaces. + """ + src = "from __future__ import absolute_import\nimport xyzzy" + assert parse(src).has_explicit_absolute_import()