summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIan Cordasco <graffatcolmingov@gmail.com>2017-05-27 20:34:04 -0500
committerIan Cordasco <graffatcolmingov@gmail.com>2017-05-27 20:34:04 -0500
commitaefa79535f985bd19c375332abea6f3712815a0a (patch)
treec993ce693654e89d4efda3375a1fa970fca90978 /src
parent178092954d2b6d5293f6211bd4e2f9f37bb8c525 (diff)
downloadflake8-aefa79535f985bd19c375332abea6f3712815a0a.tar.gz
Simplify conditoinal in decision logic
Add test to cover branch of decision logic we were not previously exercising
Diffstat (limited to 'src')
-rw-r--r--src/flake8/style_guide.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/flake8/style_guide.py b/src/flake8/style_guide.py
index 38fc29a..ebc01ed 100644
--- a/src/flake8/style_guide.py
+++ b/src/flake8/style_guide.py
@@ -146,8 +146,8 @@ class StyleGuide(object):
return find_more_specific(extra_select, ignore)
if select or (extra_select and self._using_default_select):
return Decision.Selected
- if ((select is None and extra_select is None) or
- (not self._using_default_ignore and select is None)):
+ if (select is None and
+ (extra_select is None or not self._using_default_ignore)):
return Decision.Ignored
return Decision.Selected