Enable wildcard import pylint (#35786)
* Wildcard imports should be taken care of. Enable the pylint check for them * Remove wildcard import code-smell test as we're now checking via pylint * Add unused-wildcard-import as ignored in our compat code. These three files use wildcard imports so that they can export symbols in a compatible location. The real code lives elsewhere. So disable the pylint tests for the relevant sections of code.
This commit is contained in:
parent
d31ded47fb
commit
86242e6871
5 changed files with 4 additions and 37 deletions
|
@ -32,11 +32,11 @@ import sys
|
|||
try:
|
||||
# Allow wildcard import because we really do want to import all of mock's
|
||||
# symbols into this compat shim
|
||||
# pylint: disable=wildcard-import
|
||||
# pylint: disable=wildcard-import,unused-wildcard-import
|
||||
from unittest.mock import *
|
||||
except ImportError:
|
||||
# Python 2
|
||||
# pylint: disable=wildcard-import
|
||||
# pylint: disable=wildcard-import,unused-wildcard-import
|
||||
try:
|
||||
from mock import *
|
||||
except ImportError:
|
||||
|
|
|
@ -27,7 +27,7 @@ import sys
|
|||
|
||||
# Allow wildcard import because we really do want to import all of
|
||||
# unittests's symbols into this compat shim
|
||||
# pylint: disable=wildcard-import
|
||||
# pylint: disable=wildcard-import,unused-wildcard-import
|
||||
if sys.version_info < (2, 7):
|
||||
try:
|
||||
# Need unittest2 on python2.6
|
||||
|
|
|
@ -20,7 +20,7 @@ from __future__ import (absolute_import, division, print_function)
|
|||
__metaclass__ = type
|
||||
|
||||
# This is backwards compat. unsafe_proxy was moved to avoid circular imports.
|
||||
from ansible.utils.unsafe_proxy import * # pylint: disable=wildcard-import
|
||||
from ansible.utils.unsafe_proxy import * # pylint: disable=wildcard-import,unused-wildcard-import
|
||||
|
||||
try:
|
||||
from __main__ import display
|
||||
|
|
|
@ -1,31 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Only needed until we enable pylint test for wildcard imports
|
||||
|
||||
|
||||
# The first three paths here are valid uses of wildcard imports
|
||||
# unsafe_proxy is backwards compat (pylint disabled added)
|
||||
# module_common.py is picked up from static strings, not from actual imports (pylint won't detect)
|
||||
# test_action.py is picked up from static strings, not from actual imports (pylint won't detect)
|
||||
# mock.py is importing code for an installed library for compat (pylint disabled added)
|
||||
# unittest.py is importing code for an installed library for compat (pylint disabled added)
|
||||
#
|
||||
# Everything else needs to be fixed
|
||||
wildcard_imports=$(find . -path ./test/runner/.tox -prune \
|
||||
-o -path ./lib/ansible/vars/unsafe_proxy.py -prune \
|
||||
-o -path ./lib/ansible/executor/module_common.py -prune \
|
||||
-o -path ./test/units/plugins/action/test_action.py \
|
||||
-o -path ./lib/ansible/compat/tests/mock.py -prune \
|
||||
-o -path ./lib/ansible/compat/tests/unittest.py \
|
||||
-o -name '*.py' -type f -exec grep -H 'import \*' '{}' '+')
|
||||
|
||||
|
||||
if test -n "$wildcard_imports" ; then
|
||||
printf "\n== Wildcard imports detected ==\n"
|
||||
printf "%s" "$wildcard_imports"
|
||||
failures=$(printf "%s" "$wildcard_imports"| wc -l)
|
||||
failures=$((failures + 2))
|
||||
exit "$failures"
|
||||
fi
|
||||
|
||||
exit 0
|
|
@ -93,10 +93,8 @@ disable=
|
|||
unused-argument,
|
||||
unused-import,
|
||||
unused-variable,
|
||||
unused-wildcard-import,
|
||||
used-before-assignment,
|
||||
useless-super-delegation,
|
||||
wildcard-import,
|
||||
wrong-import-order,
|
||||
wrong-import-position,
|
||||
|
||||
|
|
Loading…
Reference in a new issue