Merge branch 'gh-536'

Closes #400, Closes #402, Closes #536

6 files changed, 65 insertions, 0 deletions

diff --git a/testsuite/E12not.py b/testsuite/E12not.py
index e76ef13..18c6a64 100644
--- a/testsuite/E12not.py
+++ b/testsuite/E12not.py
@@ -139,6 +139,7 @@ def long_function_name(
         var_four):
     print(var_one)
 
+
 if ((row < 0 or self.moduleCount <= row or
      col < 0 or self.moduleCount <= col)):
     raise Exception("%s,%s - %s" % (row, col, self.moduleCount))
@@ -400,6 +401,7 @@ def unicode2html(s):
                             .replace('"', '&#34;')
                             .replace('\n', '<br>\n'))
 
+
 #
 parser.add_option('--count', action='store_true',
                   help="print total number of errors and warnings "
@@ -616,6 +618,7 @@ def other_example():
         for key, val in node.items()
     ))]
 
+
 foo([
     'bug'
 ])
diff --git a/testsuite/E22.py b/testsuite/E22.py
index 9d8efda..ee9dc74 100644
--- a/testsuite/E22.py
+++ b/testsuite/E22.py
@@ -150,6 +150,7 @@ if alpha[:-i]:
 def squares(n):
     return (i**2 for i in range(n))
 
+
 ENG_PREFIXES = {
     -6: "\u03bc",  # Greek letter mu
     -3: "m",
diff --git a/testsuite/E30.py b/testsuite/E30.py
index d2d7bf3..1471079 100644
--- a/testsuite/E30.py
+++ b/testsuite/E30.py
@@ -88,3 +88,43 @@ def function():
 It gives error E303: too many blank lines (3)
 """
 #:
+
+#: E305:7:1
+def a():
+    print
+
+    # comment
+
+    # another comment
+a()
+#: E305:8:1
+def a():
+    print
+
+    # comment
+
+    # another comment
+
+try:
+    a()
+except:
+    pass
+#: E305:5:1
+def a():
+    print
+
+# Two spaces before comments, too.
+if a():
+    a()
+#:
+
+#: E305:8:1
+# Example from https://github.com/PyCQA/pycodestyle/issues/400
+import stuff
+
+
+def main():
+    blah, blah
+
+if __name__ == '__main__':
+    main()
diff --git a/testsuite/E30not.py b/testsuite/E30not.py
index 0fd8fb0..ea75057 100644
--- a/testsuite/E30not.py
+++ b/testsuite/E30not.py
@@ -132,3 +132,22 @@ def a():
 def b():
 
     pass
+#: Okay
+def foo():
+    pass
+
+
+def bar():
+    pass
+
+
+class Foo(object):
+    pass
+
+
+class Bar(object):
+    pass
+
+
+if __name__ == '__main__':
+    foo()
diff --git a/testsuite/support.py b/testsuite/support.py
index 003f181..cf9abc5 100644
--- a/testsuite/support.py
+++ b/testsuite/support.py
@@ -196,5 +196,6 @@ def run_tests(style):
         init_tests(style)
     return style.check_files()
 
+
 # nose should not collect these functions
 init_tests.__test__ = run_tests.__test__ = False
diff --git a/testsuite/test_all.py b/testsuite/test_all.py
index bd18943..08f9ea9 100644
--- a/testsuite/test_all.py
+++ b/testsuite/test_all.py
@@ -62,5 +62,6 @@ def suite():
 def _main():
     return unittest.TextTestRunner(verbosity=2).run(suite())
 
+
 if __name__ == '__main__':
     sys.exit(not _main())