9f7b0dfc30
* Enable the pylint no-name-in-module check. Checks that identifiers in
imports actually exist. When we do this, we also have to ignore
_MovedItems used in our bundled six. This means pylint won't check
for bad imports below ansible.module_utils.six.moves but that's
something that pylint punts on with a system copy of six so this is
still an improvement.
* Remove automatic use of system six. The exec in the six code which
tried to use a system library if available destroyed pylint's ability
to check for imports of identifiers which did not exist (the
no-name-in-module check). That test is important enough that we
should sacrifice the bundling detection in favour of the test.
Distributions that want to unbundle six can replace the bundled six in
ansible/module_utils/six/__init__.py to unbundle. however, be aware
that six is tricky to unbundle. They may want to base their efforts
off the code we were using:
2fff690caa/lib/ansible/module_utils/six/__init__.py
* Update tests for new location of bundled six Several code-smell tests
whitelist the bundled six library. Update the path to the library so
that they work.
* Also check for basestring in modules as the enabled pylint tests will
also point out basestring usage for us.
19 lines
575 B
Bash
Executable file
19 lines
575 B
Bash
Executable file
#!/bin/sh
|
|
|
|
ITERVALUES_USERS=$(grep -rI '\.itervalues' . \
|
|
--exclude-dir .git \
|
|
--exclude-dir .tox \
|
|
--exclude-dir docsite \
|
|
| grep -v \
|
|
-e 'six\.itervalues' \
|
|
-e lib/ansible/module_utils/six/__init__.py \
|
|
-e test/sanity/code-smell/no-dict-itervalues.sh \
|
|
)
|
|
|
|
if [ "${ITERVALUES_USERS}" ]; then
|
|
echo 'itervalues has been removed in python3. Alternatives:'
|
|
echo ' for VALUE in DICT.values():'
|
|
echo ' from ansible.module_utils.six import itervalues ; for VALUE in itervalues(DICT):'
|
|
echo "${ITERVALUES_USERS}"
|
|
exit 1
|
|
fi
|