From 5098ce89e39fd4b31d22bec99a00d8f9fa1f865e Mon Sep 17 00:00:00 2001
From: Tom Prince <tom.prince@twistedmatrix.com>
Date: Tue, 21 Jun 2016 08:57:52 -0600
Subject: [PATCH] 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.
---
 flake8/engine.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flake8/engine.py b/flake8/engine.py
index 129c338..885f9c6 100644
--- a/flake8/engine.py
+++ b/flake8/engine.py
@@ -18,7 +18,7 @@ _flake8_noqa = re.compile(r'\s*# flake8[:=]\s*noqa', re.I).search
 
 EXTRA_EXCLUDE = ['.tox', '.eggs', '*.egg']
 
-pep8.PROJECT_CONFIG += ('.flake8',)
+pep8.PROJECT_CONFIG = ('.flake8',) + pep8.PROJECT_CONFIG
 
 
 def _load_entry_point(entry_point, verify_requirements):