summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2014-12-17 01:49:04 +0100
committerFlorent Xicluna <florent.xicluna@gmail.com>2014-12-17 01:49:04 +0100
commitf184416185a9bcb1df7e16d72d77ce6fcdff4ff8 (patch)
tree95a3ff74b1bda9806ae3da57acd5943bdb39425a
parentda9f37d3d9466e1cc35579748cb8adab57b5791c (diff)
parentd3720db1bb42de06ebbc741d3490ddb8be4feab2 (diff)
downloadpep8-f184416185a9bcb1df7e16d72d77ce6fcdff4ff8.tar.gz
Merge branch 'issue-323'
-rwxr-xr-xpep8.py2
-rw-r--r--testsuite/E25.py5
2 files changed, 6 insertions, 1 deletions
diff --git a/pep8.py b/pep8.py
index 6f6a4c4..2caea77 100755
--- a/pep8.py
+++ b/pep8.py
@@ -771,7 +771,7 @@ def whitespace_around_named_parameter_equals(logical_line, tokens):
no_space = False
if start != prev_end:
yield (prev_end, message)
- elif token_type == tokenize.OP:
+ if token_type == tokenize.OP:
if text == '(':
parens += 1
elif text == ')':
diff --git a/testsuite/E25.py b/testsuite/E25.py
index 37d0d42..9b7ff69 100644
--- a/testsuite/E25.py
+++ b/testsuite/E25.py
@@ -17,6 +17,11 @@ parser.add_argument('--long-option',
#: E251:1:45
parser.add_argument('--long-option', default
="/rather/long/filesystem/path/here/blah/blah/blah")
+#: E251:3:8 E251:3:10
+foo(True,
+ baz=(1, 2),
+ biz = 'foo'
+ )
#: Okay
foo(bar=(1 == 1))
foo(bar=(1 != 1))