Merge pull request #295 from khairihafsham/add-e306

Add E306

README.rst

@@ -204,6 +204,7 @@ autopep8 fixes the following issues_ reported by pycodestyle_::
     E302 - Add missing 2 blank lines.
     E303 - Remove extra blank lines.
     E304 - Remove blank line following function decorator.
+    E306 - Expected 1 blank line before a nested definition
     E401 - Put imports on separate lines.
     E501 - Try to make lines fit within --max-line-length characters.
     E502 - Remove extraneous escape of newline.

autopep8.py

@@ -400,7 +400,7 @@ class FixPEP8(object):
         - e251
         - e261,e262
         - e271,e272,e273,e274
-        - e301,e302,e303,e304,e305
+        - e301,e302,e303,e304,e306
         - e401
         - e502
         - e701,e702
@@ -455,6 +455,7 @@ def __init__(self, filename,
         self.fix_e272 = self.fix_e271
         self.fix_e273 = self.fix_e271
         self.fix_e274 = self.fix_e271
+        self.fix_e306 = self.fix_e301
         self.fix_e501 = (
             self.fix_long_line_logically if
             options and (options.aggressive >= 2 or options.experimental) else

test/suite/E30.py

@@ -73,6 +73,22 @@ def a():
     print
 #:
 
+#: E306
+
+
+def test_descriptors(arg):
+
+    class descriptor(object):
+        def __init__(self, fn):
+            self.fn = fn
+        def __get__(self, obj, owner):
+            if obj is not None:
+                return self.fn(obj, obj)
+            else:
+                return self
+        def method(self):
+            return 'method'
+
 
 #: E304:3:1
 @decorator

test/suite/out/E30.py

@@ -89,6 +89,24 @@ def a():
     print
 #:
 
+#: E306
+
+
+def test_descriptors(arg):
+
+    class descriptor(object):
+        def __init__(self, fn):
+            self.fn = fn
+
+        def __get__(self, obj, owner):
+            if obj is not None:
+                return self.fn(obj, obj)
+            else:
+                return self
+
+        def method(self):
+            return 'method'
+
 
 #: E304:3:1
 @decorator

test/test_autopep8.py

@@ -2115,6 +2115,40 @@ def test_e274(self):
         with autopep8_context(line) as result:
             self.assertEqual(fixed, result)
 
+    def test_e306(self):
+        line = """
+def test_descriptors(self):
+
+        class descriptor(object):
+            def __init__(self, fn):
+                self.fn = fn
+            def __get__(self, obj, owner):
+                if obj is not None:
+                    return self.fn(obj, obj)
+                else:
+                    return self
+            def method(self):
+                return 'method'
+"""
+        fixed = """
+def test_descriptors(self):
+
+    class descriptor(object):
+        def __init__(self, fn):
+            self.fn = fn
+
+        def __get__(self, obj, owner):
+            if obj is not None:
+                return self.fn(obj, obj)
+            else:
+                return self
+
+        def method(self):
+            return 'method'
+"""
+        with autopep8_context(line) as result:
+            self.assertEqual(fixed, result)
+
     def test_e301(self):
         line = 'class k:\n    s = 0\n    def f():\n        print 1\n'
         fixed = 'class k:\n    s = 0\n\n    def f():\n        print 1\n'