aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2019-01-25 11:53:39 -0500
committerMarcoFalke <falke.marco@gmail.com>2019-01-25 11:53:41 -0500
commitab46fe6ec1b37e88c5a06ee7a06ab31cbd18304f (patch)
treec8aa12f794e992574669f07a6fa329a190a3f6ce
parentd14ef5721ffcf07321704dc21f1ab9df4952a44d (diff)
parentf618c58b75ba365ef851089ba31017273d52f777 (diff)
Merge #15249: Docs: Update python docs to reflect that wildcard imports are disallowed
f618c58b75 Docs: Update python docs to reflect that wildcard imports are disallowed (Ben Woosley) Pull request description: These have been disallowed via flake8 since: #13054 Tree-SHA512: f41651fd883e3786a7e87c4aa4c54749308e576287f2f88da3f1d8d0f59e14519d99061f1efd05b8745f495f87a14286cea576f1507d10ccd226f8cf2f2b3cc8
-rw-r--r--test/functional/README.md2
-rwxr-xr-xtest/functional/example_test.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/README.md b/test/functional/README.md
index bce0d5db2e..628c77eb11 100644
--- a/test/functional/README.md
+++ b/test/functional/README.md
@@ -26,7 +26,7 @@ don't have test cases for.
The Travis linter also checks this, but [possibly not in all cases](https://github.com/bitcoin/bitcoin/pull/14884#discussion_r239585126).
- See [the python lint script](/test/lint/lint-python.sh) that checks for violations that
could lead to bugs and issues in the test code.
-- Avoid wildcard imports where possible
+- Avoid wildcard imports
- Use a module-level docstring to describe what the test is testing, and how it
is testing it.
- When subclassing the BitcoinTestFramwork, place overrides for the
diff --git a/test/functional/example_test.py b/test/functional/example_test.py
index be3544ee74..f367e4fca8 100755
--- a/test/functional/example_test.py
+++ b/test/functional/example_test.py
@@ -13,7 +13,7 @@ is testing and *how* it's being tested
# libraries then local imports).
from collections import defaultdict
-# Avoid wildcard * imports if possible
+# Avoid wildcard * imports
from test_framework.blocktools import (create_block, create_coinbase)
from test_framework.messages import CInv
from test_framework.mininode import (