merge lp:~dreid/twistedchecker/blank-lines-before-more-fields

Author: exarkun

twistedchecker/checkers/docstring.py

@@ -207,7 +207,8 @@ def _checkBlankLineBeforeEpytext(self, node_type, node, linenoDocstring):
         @param linenoDocstring: linenumber of docstring
         """
         # Check whether there is a blank line before epytext markups.
-        patternEpytext = (r"\n *@(param|type|return|returns|rtype)"
+        patternEpytext = (r"\n *@(param|type|return|returns|rtype|ivar|cvar"
+                          r"|raises|raise)"
                           r"\s*[a-zA-Z0-9_]*\s*\:")
         matchedEpytext = re.search(patternEpytext, node.doc)
         if matchedEpytext:

twistedchecker/functionaltests/docstring_pass.py

@@ -62,3 +62,40 @@ def f(self):
         A method returns nothing.
         """
         return
+
+
+
+class Bar(self):
+    """
+    A cvar is recognized as being the start of epytext markup.
+
+    @cvar foo: bar baz
+    @type foo: bax
+    """
+
+    def a(self):
+        """
+        A raises field is recognized as being the start of epytext markup.
+
+        @raises FoobarException: An exception.
+        @returns: C{int}
+        """
+
+    def b(self):
+        """
+        A raise (because we are inconsistent about stuff) should also be
+        recognized as the start of epytext markup.
+
+        @raise BarException: Another exception.
+        @returns: C{int}
+        """
+
+
+
+class Baz(self):
+    """
+    An ivar is recognized as being the start of epytext markup.
+
+    @ivar foo: bar baz
+    @type foo: bax
+    """