diff options
author | Pierre Sassoulas <pierre.sassoulas@gmail.com> | 2021-03-08 21:46:04 +0100 |
---|---|---|
committer | Pierre Sassoulas <pierre.sassoulas@gmail.com> | 2021-03-14 19:48:30 +0100 |
commit | 6c540bfb0b5e66834b2bd0a9ab452257b24ebf53 (patch) | |
tree | 7157f24bd7bead4e93523011e85b1843bd1eaa0a | |
parent | 36f9cf0ef3a2bfbbc4e61696b558632f7ca40051 (diff) | |
download | pylint-git-6c540bfb0b5e66834b2bd0a9ab452257b24ebf53.tar.gz |
Migrate func_w0404.py (reimported) to new functional tests
-rw-r--r-- | tests/functional/r/reimported.py | 28 | ||||
-rw-r--r-- | tests/functional/r/reimported.txt | 5 | ||||
-rw-r--r-- | tests/input/func_w0404.py | 27 | ||||
-rw-r--r-- | tests/messages/func_w0404.txt | 5 |
4 files changed, 33 insertions, 32 deletions
diff --git a/tests/functional/r/reimported.py b/tests/functional/r/reimported.py index b73f1ce08..3fe8c901a 100644 --- a/tests/functional/r/reimported.py +++ b/tests/functional/r/reimported.py @@ -14,3 +14,31 @@ from itertools import OrderedDict as NotOrderedDict from itertools import *
from os import *
+
+# pylint: disable=misplaced-future
+from __future__ import absolute_import, print_function
+
+import sys
+
+import xml.etree.ElementTree
+from xml.etree import ElementTree # [reimported]
+
+from email import encoders
+import email.encoders # [reimported]
+
+import sys # [reimported] #pylint: disable=ungrouped-imports,wrong-import-order
+__revision__ = 0
+
+def no_reimport():
+ """docstring"""
+ import os #pylint: disable=import-outside-toplevel
+ print(os)
+
+
+def reimport():
+ """This function contains a reimport."""
+ import sys # [reimported,redefined-outer-name] #pylint: disable=import-outside-toplevel
+ del sys
+
+
+del sys, ElementTree, xml.etree.ElementTree, encoders, email.encoders
diff --git a/tests/functional/r/reimported.txt b/tests/functional/r/reimported.txt index 289fa2765..f947012af 100644 --- a/tests/functional/r/reimported.txt +++ b/tests/functional/r/reimported.txt @@ -2,3 +2,8 @@ reimported:3:0::Reimport 'sleep' (imported line 3) reimported:4:0::Reimport 'missing' (imported line 4) reimported:7:0::Reimport 'missing1' (imported line 6) reimported:10:0::Reimport 'deque' (imported line 9) +reimported:24:0::Reimport 'ElementTree' (imported line 23) +reimported:27:0::Reimport 'email.encoders' (imported line 26) +reimported:29:0::Reimport 'sys' (imported line 21) +redefined-outer-name:40:4:reimport:Redefining name 'sys' from outer scope (line 16) +reimported:40:4:reimport:Reimport 'sys' (imported line 21) diff --git a/tests/input/func_w0404.py b/tests/input/func_w0404.py deleted file mode 100644 index 1a3db7f66..000000000 --- a/tests/input/func_w0404.py +++ /dev/null @@ -1,27 +0,0 @@ -"""Unittests for W0404 (reimport)""" -from __future__ import absolute_import, print_function - -import sys - -import xml.etree.ElementTree -from xml.etree import ElementTree - -from email import encoders -import email.encoders - -import sys #pylint: disable=ungrouped-imports,wrong-import-order -__revision__ = 0 - -def no_reimport(): - """docstring""" - import os #pylint: disable=import-outside-toplevel - print(os) - - -def reimport(): - """This function contains a reimport.""" - import sys #pylint: disable=import-outside-toplevel - del sys - - -del sys, ElementTree, xml.etree.ElementTree, encoders, email.encoders diff --git a/tests/messages/func_w0404.txt b/tests/messages/func_w0404.txt deleted file mode 100644 index 2cfc13736..000000000 --- a/tests/messages/func_w0404.txt +++ /dev/null @@ -1,5 +0,0 @@ -W: 7: Reimport 'ElementTree' (imported line 6) -W: 10: Reimport 'email.encoders' (imported line 9) -W: 12: Reimport 'sys' (imported line 4) -W: 23:reimport: Redefining name 'sys' from outer scope (line 4) -W: 23:reimport: Reimport 'sys' (imported line 4) |