Fix types of skips

Author: larsoner

docs/release_notes.rst

@@ -19,9 +19,9 @@ New Features
 * Added the ability to ignore specific function and method doctstrings with
   comments:
 
-    1. "# noqa" or "# pydocstyle: noqa" skips all checks.
+    1. "# noqa" skips all checks.
 
-    2. "# pydocstyle: D102,D203" can be used to skip specific checks.
+    2. "# noqa: D102,D203" can be used to skip specific checks.
 
 Bug Fixes
 

docs/snippets/per_file.rst

@@ -1,13 +1,15 @@
 ``pydocstyle`` inline commenting to skip specific checks on specific
 functions or methods. The supported comments that can be added are:
 
-1. ``"# noqa"`` or ``"# pydocstyle: noqa"`` skips all checks.
+1. ``"# noqa"`` skips all checks.
 
-2. ``"# pydocstyle: D102,D203"`` can be used to skip specific checks.
+2. ``"# noqa: D102,D203"`` can be used to skip specific checks. Note that
+   this is compatible with skips from `flake8 <http://flake8.pycqa.org/>`_,
+   e.g. ``# noqa: D102,E501,D203``.
 
 For example, this will skip the check for a period at the end of a function
 docstring::
 
-    >>> def bad_function():  # pydocstyle: D400
+    >>> def bad_function():  # noqa: D400
     ...     """Omit a period in the docstring as an exception"""
     ...     pass

src/pydocstyle.py

@@ -472,12 +472,10 @@ def parse_definition(self, class_):
         skips = ''
         if self.current.kind in (tk.NEWLINE, tk.COMMENT):
             if self.current.kind == tk.COMMENT:
-                if self.current.value.startswith('# noqa') or \
-                        'pydocstyle: noqa' in self.current.value:
+                if 'noqa: ' in self.current.value:
+                    skips = ''.join(self.current.value.split('noqa: ')[1:])
+                elif self.current.value.startswith('# noqa'):
                     skips = 'all'
-                elif 'pydocstyle: ' in self.current.value:
-                    skips = ''.join(self.current.value.split(
-                        'pydocstyle: ')[1:])
             self.leapfrog(tk.INDENT)
             assert self.current.kind != tk.INDENT
             docstring = self.parse_docstring()

src/tests/test_cases/test.py

@@ -352,13 +352,13 @@ def docstring_bad_ignore_all():  # noqa
     pass
 
 
-def docstring_bad_ignore_all_2():  # pydocstyle: noqa
+def docstring_bad_ignore_one():  # noqa: D400,D401
     """Runs something"""
     pass
 
 
 @expect("D401: First line should be in imperative mood ('Run', not 'Runs')")
-def docstring_bad_ignore_one():  # pydocstyle: D400
+def docstring_ignore_violations_of_pydocstyle_D400_and_PEP8_E501_but_catch_D401():  # noqa: E501,D400
     """Runs something"""
     pass