A false positive E126 with embedded colon; fixes #144

Author: florentx

CHANGES.txt

@@ -17,6 +17,8 @@ Changelog
 
 * Fix a false positive E124 for hanging indent. (Issue #254)
 
+* Fix a false positive E126 with embedded colon. (Issue #144)
+
 * Fix behaviour when ``exclude`` is in the configuration file and
   the current directory is not the project directory. (Issue #247)
 

pep8.py

@@ -516,6 +516,8 @@ def continued_indentation(logical_line, tokens, indent_level, hang_closing,
         # special case for the "if" statement because len("if (") == 4
         elif not indent_chances and not row and not depth and text == 'if':
             indent_chances[end[1] + 1] = True
+        elif text == ':' and line[end[1]:].isspace():
+            open_rows[depth].append(row)
 
         # keep track of bracket depth
         if token_type == tokenize.OP:

testsuite/E12.py

@@ -248,12 +248,6 @@ def qualify_by_address(
     "long": "the quick brown fox jumps over the lazy dog before doing a "
         "somersault",
 }
-#: E126
-# probably not easily fixed, without using 'ast'
-troublesome_hash_ii = {
-    "long key that tends to happen more when you're indented":
-        "stringwithalongtoken you don't want to break",
-}
 #:
 
 

testsuite/E12not.py

@@ -619,4 +619,16 @@ def other_example():
 foo([
     'bug'
 ])
+
+# issue 144, finally!
+some_hash = {
+    "long key that tends to happen more when you're indented":
+        "stringwithalongtoken you don't want to break",
+}
+
+{
+    1:
+        999999 if True
+        else 0,
+}
 #

testsuite/E90.py

@@ -8,7 +8,7 @@
 	    pass
 	except:
 		print 'Whoops'
-#: E122 E122 E225 E251 E251 E701
+#: E122 E225 E251 E251 E701
 
 # Do not crash if code is invalid
 if msg: