Merge pull request #913 from anntzer/afteronelinerblock

Correctly allow *two* blank lines after a block of one-liners.

Author: asottile

pycodestyle.py

@@ -1797,6 +1797,7 @@ def expand_indent(line):
     >>> expand_indent('        \t')
     16
     """
+    line = line.rstrip('\n\r')
     if '\t' not in line:
         return len(line) - len(line.lstrip())
     result = 0

testsuite/E30not.py

@@ -167,6 +167,10 @@ def foo(x):
 # for no E30x being emitted.
 def bar(): pass
 def baz(): pass
+
+
+def main():
+    pass
 #: E704:4:5 E704:5:5
 def foo():
     # This emits the (ignored-by-default) E704, but here we're testing