diff options
author | Laura M?dioni <laura.medioni@logilab.fr> | 2015-11-10 13:36:56 +0100 |
---|---|---|
committer | Laura M?dioni <laura.medioni@logilab.fr> | 2015-11-10 13:36:56 +0100 |
commit | 38fd37a36933409625f422cbd7b91740540e3172 (patch) | |
tree | fe0d1b372cb7098ceb91ab8725123661ffb77046 /pylint/test/input | |
parent | 722446bab92ad13489d73119d534c9a7cf8f8b2c (diff) | |
download | pylint-38fd37a36933409625f422cbd7b91740540e3172.tar.gz |
Check imports are located at the top of the module (right after docstring and comments)
related to issue #692
Diffstat (limited to 'pylint/test/input')
-rw-r--r-- | pylint/test/input/func_3k_removed_stuff_py_30.py | 2 | ||||
-rw-r--r-- | pylint/test/input/func_bad_assigment_to_exception_var.py | 2 | ||||
-rw-r--r-- | pylint/test/input/func_bug113231.py | 4 | ||||
-rw-r--r-- | pylint/test/input/func_dotted_ancestor.py | 4 | ||||
-rw-r--r-- | pylint/test/input/func_e12xx.py | 3 | ||||
-rw-r--r-- | pylint/test/input/func_logging_not_lazy_with_logger.py | 3 | ||||
-rw-r--r-- | pylint/test/input/func_noerror_builtin_module_test.py | 4 | ||||
-rw-r--r-- | pylint/test/input/func_w0233.py | 4 | ||||
-rw-r--r-- | pylint/test/input/func_w0401_package/all_the_things.py | 2 | ||||
-rw-r--r-- | pylint/test/input/func_w0401_package/thing2.py | 2 | ||||
-rw-r--r-- | pylint/test/input/func_w0404.py | 2 | ||||
-rw-r--r-- | pylint/test/input/func_w0405.py | 6 | ||||
-rw-r--r-- | pylint/test/input/func_w0406.py | 3 | ||||
-rw-r--r-- | pylint/test/input/func_w0623_py_30.py | 4 |
14 files changed, 24 insertions, 21 deletions
diff --git a/pylint/test/input/func_3k_removed_stuff_py_30.py b/pylint/test/input/func_3k_removed_stuff_py_30.py index 3d23069..54ad935 100644 --- a/pylint/test/input/func_3k_removed_stuff_py_30.py +++ b/pylint/test/input/func_3k_removed_stuff_py_30.py @@ -1,9 +1,9 @@ """test relative import""" # pylint: disable=no-absolute-import from __future__ import print_function +import func_w0401 __revision__ = filter(None, map(str, (1, 2, 3))) -import func_w0401 def function(): """something""" diff --git a/pylint/test/input/func_bad_assigment_to_exception_var.py b/pylint/test/input/func_bad_assigment_to_exception_var.py index 640fcf0..93d0644 100644 --- a/pylint/test/input/func_bad_assigment_to_exception_var.py +++ b/pylint/test/input/func_bad_assigment_to_exception_var.py @@ -1,8 +1,8 @@ # pylint:disable=C0103, print-statement, no-absolute-import """ho ho ho""" from __future__ import print_function -__revision__ = 'toto' import sys +__revision__ = 'toto' e = 1 e2 = 'yo' diff --git a/pylint/test/input/func_bug113231.py b/pylint/test/input/func_bug113231.py index 1697ed6..70602e2 100644 --- a/pylint/test/input/func_bug113231.py +++ b/pylint/test/input/func_bug113231.py @@ -4,11 +4,11 @@ """test bugfix for #113231 in logging checker """ from __future__ import absolute_import -__revision__ = '' - # Muck up the names in an effort to confuse... import logging as renamed_logging +__revision__ = '' + class Logger(object): """Fake logger""" pass diff --git a/pylint/test/input/func_dotted_ancestor.py b/pylint/test/input/func_dotted_ancestor.py index 0603524..ff32858 100644 --- a/pylint/test/input/func_dotted_ancestor.py +++ b/pylint/test/input/func_dotted_ancestor.py @@ -1,10 +1,10 @@ """bla""" # pylint: disable=no-absolute-import -__revision__ = 'yo' - from input import func_w0233 +__revision__ = 'yo' + class Aaaa(func_w0233.AAAA): """test dotted name in ancestors""" def __init__(self): diff --git a/pylint/test/input/func_e12xx.py b/pylint/test/input/func_e12xx.py index 67475d1..74984d9 100644 --- a/pylint/test/input/func_e12xx.py +++ b/pylint/test/input/func_e12xx.py @@ -2,9 +2,10 @@ """Test checking of log format strings """ +import logging + __revision__ = '' -import logging def pprint(): """Test string format in logging statements. diff --git a/pylint/test/input/func_logging_not_lazy_with_logger.py b/pylint/test/input/func_logging_not_lazy_with_logger.py index afbe285..973a5c7 100644 --- a/pylint/test/input/func_logging_not_lazy_with_logger.py +++ b/pylint/test/input/func_logging_not_lazy_with_logger.py @@ -1,9 +1,8 @@ """Logging warnings using a logger class.""" from __future__ import absolute_import -__revision__ = '' - import logging +__revision__ = '' LOG = logging.getLogger("domain") LOG.debug("%s" % "junk") diff --git a/pylint/test/input/func_noerror_builtin_module_test.py b/pylint/test/input/func_noerror_builtin_module_test.py index f73694a..9b1e7ce 100644 --- a/pylint/test/input/func_noerror_builtin_module_test.py +++ b/pylint/test/input/func_noerror_builtin_module_test.py @@ -1,8 +1,10 @@ """test import from a builtin module""" + from __future__ import absolute_import +from math import log10 + __revision__ = None -from math import log10 def log10_2(): """bla bla bla""" diff --git a/pylint/test/input/func_w0233.py b/pylint/test/input/func_w0233.py index 6427232..f373d4f 100644 --- a/pylint/test/input/func_w0233.py +++ b/pylint/test/input/func_w0233.py @@ -2,6 +2,8 @@ """test for call to __init__ from a non ancestor class """ from __future__ import print_function +from . import func_w0233 +import nonexistant __revision__ = '$Id: func_w0233.py,v 1.2 2004-09-29 08:35:13 syt Exp $' class AAAA(object): @@ -17,8 +19,6 @@ class BBBBMixin(object): def __init__(self): print('init', self) -import nonexistant -from . import func_w0233 class CCC(BBBBMixin, func_w0233.AAAA, func_w0233.BBBB, nonexistant.AClass): """mix different things, some inferable some not""" def __init__(self): diff --git a/pylint/test/input/func_w0401_package/all_the_things.py b/pylint/test/input/func_w0401_package/all_the_things.py index 67a627e..b8bd47b 100644 --- a/pylint/test/input/func_w0401_package/all_the_things.py +++ b/pylint/test/input/func_w0401_package/all_the_things.py @@ -1,9 +1,9 @@ """All the things!""" # pylint: disable=no-absolute-import -__revision__ = None from .thing1 import THING1 from .thing2 import THING2 from .thing2 import THING1_PLUS_THING2 +__revision__ = None _ = (THING1, THING2, THING1_PLUS_THING2) del _ diff --git a/pylint/test/input/func_w0401_package/thing2.py b/pylint/test/input/func_w0401_package/thing2.py index 987965e..66d3316 100644 --- a/pylint/test/input/func_w0401_package/thing2.py +++ b/pylint/test/input/func_w0401_package/thing2.py @@ -1,7 +1,7 @@ """The second thing.""" # pylint: disable=no-absolute-import -__revision__ = None from .all_the_things import THING1 +__revision__ = None THING2 = "I am thing2" THING1_PLUS_THING2 = "%s, plus %s" % (THING1, THING2) diff --git a/pylint/test/input/func_w0404.py b/pylint/test/input/func_w0404.py index b9169d7..5111c60 100644 --- a/pylint/test/input/func_w0404.py +++ b/pylint/test/input/func_w0404.py @@ -1,6 +1,5 @@ """Unittests for W0404 (reimport)""" from __future__ import absolute_import, print_function -__revision__ = 0 import sys @@ -11,6 +10,7 @@ from email import encoders import email.encoders import sys #pylint: disable=ungrouped-imports +__revision__ = 0 def no_reimport(): """docstring""" diff --git a/pylint/test/input/func_w0405.py b/pylint/test/input/func_w0405.py index 3f6efc7..50a069d 100644 --- a/pylint/test/input/func_w0405.py +++ b/pylint/test/input/func_w0405.py @@ -1,14 +1,14 @@ """check reimport """ from __future__ import absolute_import, print_function -__revision__ = 0 -# pylint: disable=using-constant-test,ungrouped-imports + +# pylint: disable=using-constant-test,ungrouped-imports,wrong-import-position import os from os.path import join, exists - import os import re as _re +__revision__ = 0 _re.match('yo', '.*') if __revision__: diff --git a/pylint/test/input/func_w0406.py b/pylint/test/input/func_w0406.py index d45a6b5..ceb12b5 100644 --- a/pylint/test/input/func_w0406.py +++ b/pylint/test/input/func_w0406.py @@ -1,9 +1,10 @@ """test module importing itself""" # pylint: disable=no-absolute-import,using-constant-test from __future__ import print_function +from . import func_w0406 + __revision__ = 0 -from . import func_w0406 if __revision__: print(func_w0406) diff --git a/pylint/test/input/func_w0623_py_30.py b/pylint/test/input/func_w0623_py_30.py index 14c22a8..cc8d36c 100644 --- a/pylint/test/input/func_w0623_py_30.py +++ b/pylint/test/input/func_w0623_py_30.py @@ -1,9 +1,9 @@ """Test for W0623, overwriting names in exception handlers.""" # pylint: disable=broad-except,bare-except,print-statement,no-absolute-import,duplicate-except -__revision__ = '' - import exceptions +__revision__ = '' + class MyError(Exception): """Special exception class.""" pass |