summaryrefslogtreecommitdiff
path: root/pep8.py
diff options
context:
space:
mode:
authorIan Lee <IanLee1521@gmail.com>2015-01-26 22:28:08 -0800
committerIan Lee <IanLee1521@gmail.com>2015-01-26 22:29:16 -0800
commitf7a9648da6245738b72fcd664a20168d54953ee7 (patch)
treeaec050e3a89395a6a75df9658337f9c9ebbff1e2 /pep8.py
parent510003502b5e067b927e9a62b69937cd9b0eff6e (diff)
downloadpep8-f7a9648da6245738b72fcd664a20168d54953ee7.tar.gz
Allow backslash to end a line if within inline comment; issue #374
Diffstat (limited to 'pep8.py')
-rwxr-xr-xpep8.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/pep8.py b/pep8.py
index 67b32d1..df39802 100755
--- a/pep8.py
+++ b/pep8.py
@@ -972,10 +972,14 @@ def explicit_line_join(logical_line, tokens):
Okay: aaa = [123,\n 123]
Okay: aaa = ("bbb "\n "ccc")
Okay: aaa = "bbb " \\n "ccc"
+ Okay: aaa = 123 # \\
"""
prev_start = prev_end = parens = 0
+ comment = False
for token_type, text, start, end, line in tokens:
- if start[0] != prev_start and parens and backslash:
+ if token_type == tokenize.COMMENT:
+ comment = True
+ if start[0] != prev_start and parens and backslash and not comment:
yield backslash, "E502 the backslash is redundant between brackets"
if end[0] != prev_end:
if line.rstrip('\r\n').endswith('\\'):