Merge pull request #77 from Nurdok/issue-76

Handle one-liner defintions

Author: Nurdok

pep257.py

@@ -186,9 +186,9 @@ def __call__(self, filelike, filename):
     def consume(self, kind):
         assert self.stream.move().kind == kind
 
-    def leapfrog(self, kind):
+    def leapfrog(self, kind, value=None):
         for token in self.stream:
-            if token.kind == kind:
+            if token.kind == kind and (value is None or token.value == value):
                 self.consume(kind)
                 return
 
@@ -264,12 +264,19 @@ def parse_definition(self, class_):
         start = self.line
         self.consume(tk.NAME)
         name = self.current.value
-        self.leapfrog(tk.INDENT)
-        assert self.current.kind != tk.INDENT
-        docstring = self.parse_docstring()
-        children = list(self.parse_definitions(class_))
-        assert self.current.kind == tk.DEDENT
-        end = self.line - 1
+        self.leapfrog(tk.OP, value=":")
+        if self.current.kind in (tk.NEWLINE, tk.COMMENT):
+            self.leapfrog(tk.INDENT)
+            assert self.current.kind != tk.INDENT
+            docstring = self.parse_docstring()
+            children = list(self.parse_definitions(class_))
+            assert self.current.kind == tk.DEDENT
+            end = self.line - 1
+        else:  # one-liner definition
+            docstring = self.parse_docstring()
+            children = []
+            end = self.line
+            self.leapfrog(tk.NEWLINE)
         definition = class_(name, self.source, start, end,
                             docstring, children, None)
         for child in definition.children:

test.py

@@ -216,4 +216,20 @@ def old_209():
 
     """
 
+
+@expect("D103: Docstring missing")
+def oneliner_d102(): return
+
+
+@expect("D400: First line should end with '.', not 'r'")
+def oneliner_withdoc(): """One liner"""
+
+
+@expect("D208: Docstring is over-indented")
+def docstring_start_in_same_line(): """First Line.
+
+    Second Line
+    """
+
+
 expect('test.py', 'D100: Docstring missing')

tox.ini

@@ -11,3 +11,7 @@ commands = py.test --pep8
 deps = pytest
        pytest-pep8
        mock
+
+[pytest]
+pep8ignore =
+    test.py E701