summaryrefslogtreecommitdiff
path: root/src/flake8
diff options
context:
space:
mode:
authorTom Prince <tom.prince@twistedmatrix.com>2016-06-21 08:57:52 -0600
committerTom Prince <tom.prince@twistedmatrix.com>2016-06-25 14:22:21 -0600
commitdb9d4ad8b4cc2aab1ef8349dc969faa8f589e9cc (patch)
tree54db9d9cd4c6c1ab7410b4a0ff6313fe57456ec8 /src/flake8
parent00575214dbef70356fbcb59b597aa8c98aed236c (diff)
downloadflake8-db9d4ad8b4cc2aab1ef8349dc969faa8f589e9cc.tar.gz
Prefer `.flake8` if present for options.
If somebody explicitly has a `.flake8` file, presumably they intend to put flake8 configuration in it, so prefer it to the generic `setup.cfg` and `tox.ini` from pycodestyle.
Diffstat (limited to 'src/flake8')
-rw-r--r--src/flake8/options/config.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/flake8/options/config.py b/src/flake8/options/config.py
index 48719a8..4556ab1 100644
--- a/src/flake8/options/config.py
+++ b/src/flake8/options/config.py
@@ -41,7 +41,9 @@ class ConfigFileFinder(object):
self.program_name = program_name
# List of filenames to find in the local/project directory
- self.project_filenames = ('setup.cfg', 'tox.ini', self.program_config)
+ self.project_filenames = (
+ self.program_config,
+ ) + self.PROJECT_FILENAMES
self.local_directory = os.path.abspath(os.curdir)