summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIan Cordasco <graffatcolmingov@gmail.com>2016-10-26 11:39:07 +0000
committerIan Cordasco <graffatcolmingov@gmail.com>2016-10-26 11:39:07 +0000
commit185a073c296e2276597b564d31796e9cd38f7b93 (patch)
tree9391551fbafc5169a88cd7bc8dd0f81f11810448 /src
parenta9e15afbf50b3181af45a64f5736d432731eb40d (diff)
parent68a273144e5bd24a8f88cbf61070ab020be00498 (diff)
downloadflake8-185a073c296e2276597b564d31796e9cd38f7b93.tar.gz
Merge branch 'example-project' into 'master'
Add an example plugin project to source tree Necessary to start investigating issue #239 See merge request !128
Diffstat (limited to 'src')
-rw-r--r--src/flake8/style_guide.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/flake8/style_guide.py b/src/flake8/style_guide.py
index 4d8950c..739edd8 100644
--- a/src/flake8/style_guide.py
+++ b/src/flake8/style_guide.py
@@ -65,6 +65,7 @@ class StyleGuide(object):
self._selected = tuple(options.select)
self._extended_selected = tuple(options.extended_default_select)
self._ignored = tuple(options.ignore)
+ self._enabled_extensions = tuple(options.enable_extensions)
self._decision_cache = {}
self._parsed_diff = {}
@@ -81,10 +82,10 @@ class StyleGuide(object):
Ignored.Implicitly if the selected list is not empty but no match
was found.
"""
- if not self._selected:
+ if not (self._selected or self._enabled_extensions):
return Selected.Implicitly
- if code.startswith(self._selected):
+ if code.startswith(self._selected + self._enabled_extensions):
return Selected.Explicitly
# If it was not explicitly selected, it may have been implicitly