From 09f4652c7476957547230c3c1f2bc4b17fa4e33f Mon Sep 17 00:00:00 2001 From: moylop260 Date: Sun, 27 Sep 2015 10:12:34 -0500 Subject: Fix #362 - support in import and add test --- pylint/checkers/imports.py | 2 +- pylint/test/functional/deprecated_module_py2.py | 4 +++- pylint/test/functional/deprecated_module_py2.txt | 3 +++ pylint/test/functional/deprecated_module_uninstalled.py | 5 +++++ pylint/test/functional/deprecated_module_uninstalled.rc | 2 ++ pylint/test/functional/deprecated_module_uninstalled.txt | 2 ++ tox.ini | 3 ++- 7 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 pylint/test/functional/deprecated_module_uninstalled.py create mode 100644 pylint/test/functional/deprecated_module_uninstalled.rc create mode 100644 pylint/test/functional/deprecated_module_uninstalled.txt diff --git a/pylint/checkers/imports.py b/pylint/checkers/imports.py index 55c9d8d..a5a2f28 100644 --- a/pylint/checkers/imports.py +++ b/pylint/checkers/imports.py @@ -255,12 +255,12 @@ given file (report RP0402 must not be disabled)'} """triggered when an import statement is seen""" modnode = node.root() for name, _ in node.names: + self._check_deprecated_module(node, name) importedmodnode = self.get_imported_module(node, name) if importedmodnode is None: continue self._check_relative_import(modnode, node, importedmodnode, name) self._add_imported_module(node, importedmodnode.name) - self._check_deprecated_module(node, name) self._check_reimport(node, name) # TODO This appears to be the list of all messages of the checker... diff --git a/pylint/test/functional/deprecated_module_py2.py b/pylint/test/functional/deprecated_module_py2.py index d705b07..399ed87 100644 --- a/pylint/test/functional/deprecated_module_py2.py +++ b/pylint/test/functional/deprecated_module_py2.py @@ -1,6 +1,8 @@ """Test deprecated modules.""" -# pylint: disable=unused-import +# pylint: disable=unused-import,no-name-in-module,import-error import Bastion # [deprecated-module] import rexec # [deprecated-module] +from Bastion import bastion_module # [deprecated-module] +from rexec import rexec_module # [deprecated-module] diff --git a/pylint/test/functional/deprecated_module_py2.txt b/pylint/test/functional/deprecated_module_py2.txt index bcec3a6..43aa1cd 100644 --- a/pylint/test/functional/deprecated_module_py2.txt +++ b/pylint/test/functional/deprecated_module_py2.txt @@ -1,2 +1,5 @@ deprecated-module:4::Uses of a deprecated module 'Bastion' deprecated-module:5::Uses of a deprecated module 'rexec' +deprecated-module:7::Uses of a deprecated module 'Bastion' +deprecated-module:8::Uses of a deprecated module 'rexec' +deprecated-module:10::Uses of a deprecated module 'uninstalled' diff --git a/pylint/test/functional/deprecated_module_uninstalled.py b/pylint/test/functional/deprecated_module_uninstalled.py new file mode 100644 index 0000000..52d55fa --- /dev/null +++ b/pylint/test/functional/deprecated_module_uninstalled.py @@ -0,0 +1,5 @@ +"""Test deprecated modules uninstalled.""" +# pylint: disable=unused-import,no-name-in-module,import-error + +from uninstalled import uninstalled_module # [deprecated-module] +import uninstalled # [deprecated-module] diff --git a/pylint/test/functional/deprecated_module_uninstalled.rc b/pylint/test/functional/deprecated_module_uninstalled.rc new file mode 100644 index 0000000..05973da --- /dev/null +++ b/pylint/test/functional/deprecated_module_uninstalled.rc @@ -0,0 +1,2 @@ +[Messages Control] +deprecated-modules=uninstalled \ No newline at end of file diff --git a/pylint/test/functional/deprecated_module_uninstalled.txt b/pylint/test/functional/deprecated_module_uninstalled.txt new file mode 100644 index 0000000..6f14ddd --- /dev/null +++ b/pylint/test/functional/deprecated_module_uninstalled.txt @@ -0,0 +1,2 @@ +deprecated-module:4::Uses of a deprecated module 'uninstalled' +deprecated-module:5::Uses of a deprecated module 'uninstalled' diff --git a/tox.ini b/tox.ini index 859e97f..1a03469 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,8 @@ [tox] # official list is #envlist = py27, py32, py33, py34 -envlist = py27, py33, pylint +#envlist = py27, py33, pylint +envlist = py27 [testenv:pylint] deps = -- cgit v1.2.1