Merge ~cjwatson/lazr.restful:simplify-error-status-tests into lazr.restful:main

[Colin Watson]

Simplify error_status tests

[Jürgen Gmach (jugmac00)]

review: Approve

diff --git a/src/lazr/restful/declarations.py b/src/lazr/restful/declarations.py
index 1ea9e21..0fca6c1 100644
--- a/src/lazr/restful/declarations.py
+++ b/src/lazr/restful/declarations.py
@@ -547,7 +547,7 @@ def webservice_error(status):
 
 
 def error_status(status):
-    """Make a Python 2.6 class decorator for the given status.
+    """Make a class decorator for the given status.
 
     Usage 1:
         @error_status(400)
diff --git a/src/lazr/restful/docs/webservice-declarations.rst b/src/lazr/restful/docs/webservice-declarations.rst
index 2a8eb46..8c66e30 100644
--- a/src/lazr/restful/docs/webservice-declarations.rst
+++ b/src/lazr/restful/docs/webservice-declarations.rst
@@ -675,25 +675,13 @@ Exporting exceptions
 
 When a method raises an exception, the default is to report the error as
 '500 Internal Server Error'. In many cases, that's not the case and one
-of the 4XX error would be better.
-
-For Python 2.6 or higher, or for annotating an already existing exception,
-you can use error_status.
-
-In Python 2.6, you would spell this as follows::
-
-    from lazr.restful.declarations import error_status
-    @error_status(400)
-    class InvalidDemo(Exception):
-        """An example exception"""
-
-In earlier Pythons it is still usable.
+of the 4XX error would be better. You can use error_status to annotate an
+exception with a suitable HTTP status.
 
     >>> from lazr.restful.declarations import error_status
-    >>> class InvalidDemo(Exception):
+    >>> @error_status(400)
+    ... class InvalidDemo(Exception):
     ...     """An example exception"""
-    ...
-    >>> ignore = error_status(400)(InvalidDemo)
 
 The function sets the __lazr_webservice_error__ attribute on the
 exception, which will be used by the view handling the exception.