summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stapleton Cordasco <graffatcolmingov@gmail.com>2017-08-08 12:40:27 +0000
committerIan Stapleton Cordasco <graffatcolmingov@gmail.com>2017-08-08 12:40:27 +0000
commitd5dfd1180dffa5f479b286a40fad9a0b704ef62e (patch)
tree89b9b8cf0339b986085b5e18f4d7588cb04167ae
parentda20f0402412ce537c1a5b2b3b094566f5d777bd (diff)
parentbf25fef7eb5eedd2d197a3a3b0ff1d523488a3b1 (diff)
downloadflake8-d5dfd1180dffa5f479b286a40fad9a0b704ef62e.tar.gz
Merge branch 'issue/362' into 'master'
Lint only *.py files with --diff option Closes #362 See merge request !206
-rw-r--r--src/flake8/checker.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/flake8/checker.py b/src/flake8/checker.py
index 569eafa..6e53cb5 100644
--- a/src/flake8/checker.py
+++ b/src/flake8/checker.py
@@ -209,6 +209,7 @@ class Manager(object):
filename_patterns = self.options.filename
running_from_vcs = self.options._running_from_vcs
+ running_from_diff = self.options.diff
# NOTE(sigmavirus24): Yes this is a little unsightly, but it's our
# best solution right now.
@@ -227,6 +228,7 @@ class Manager(object):
# If it was specified explicitly, the user intended for it to be
# checked.
explicitly_provided = (not running_from_vcs and
+ not running_from_diff and
(argument == filename))
return ((file_exists and
(explicitly_provided or matches_filename_patterns)) or