summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIan Cordasco <graffatcolmingov@gmail.com>2016-06-28 20:47:16 -0500
committerIan Cordasco <graffatcolmingov@gmail.com>2016-06-28 20:47:16 -0500
commit75e1c1efbf00af78818a1f69d2b2fa5d5a3ffff9 (patch)
treebe7759cca17f5e92802c938a5fdfce62af8e20c0 /src
parent15745558c17fa9732c015f0f4e7fd9386519a70c (diff)
downloadflake8-75e1c1efbf00af78818a1f69d2b2fa5d5a3ffff9.tar.gz
Revert "Prefer `.flake8` if present for options."
The intended behaviour already existed. This reverts commit db9d4ad8b4cc2aab1ef8349dc969faa8f589e9cc.
Diffstat (limited to 'src')
-rw-r--r--src/flake8/options/config.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/flake8/options/config.py b/src/flake8/options/config.py
index 1d18c2e..ec5023b 100644
--- a/src/flake8/options/config.py
+++ b/src/flake8/options/config.py
@@ -41,9 +41,7 @@ class ConfigFileFinder(object):
self.program_name = program_name
# List of filenames to find in the local/project directory
- self.project_filenames = (
- self.program_config,
- ) + self.PROJECT_FILENAMES
+ self.project_filenames = ('setup.cfg', 'tox.ini', self.program_config)
self.local_directory = os.path.abspath(os.curdir)