summaryrefslogtreecommitdiff
path: root/coverage/control.py
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2016-11-19 17:04:06 -0500
committerNed Batchelder <ned@nedbatchelder.com>2016-11-19 17:04:06 -0500
commit12883bec6ecbbfb2d305b06c6280aabf75e616e6 (patch)
treed50661bd7af4c3bdcf0fdd2f74b104e06adacb7a /coverage/control.py
parent6bff6386d161dbd9d1a15010bfc48d18cedb4173 (diff)
downloadpython-coveragepy-git-12883bec6ecbbfb2d305b06c6280aabf75e616e6.tar.gz
Update the docs about reading tox.ini
Diffstat (limited to 'coverage/control.py')
-rw-r--r--coverage/control.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/coverage/control.py b/coverage/control.py
index e0aa998a..1cf86c37 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -101,8 +101,8 @@ class Coverage(object):
file can't be read, it is an error.
* If it is True, then a few standard files names are tried
- (".coveragerc", "setup.cfg"). It is not an error for these files
- to not be found.
+ (".coveragerc", "setup.cfg", "tox.ini"). It is not an error for
+ these files to not be found.
* If it is False, then no configuration file is read.
@@ -142,7 +142,7 @@ class Coverage(object):
config_file = True
specified_file = (config_file is not True)
if not specified_file:
- config_file = ".coveragerc"
+ config_file = ".coveragerc" # pylint: disable=redefined-variable-type
self.config_file = config_file
for fname, prefix in [(config_file, ""),