Fix docstrings for wsigfied methods.

2 files changed, 11 insertions, 0 deletions

diff --git a/nova/api/__init__.py b/nova/api/__init__.py
index f693225d9..1dabd3d21 100644
--- a/nova/api/__init__.py
+++ b/nova/api/__init__.py
@@ -30,6 +30,7 @@ import routes
 import webob.dec
 
 from nova import flags
+from nova import utils
 from nova import wsgi
 from nova.api import cloudpipe
 from nova.api import ec2
@@ -83,6 +84,7 @@ class API(wsgi.Router):
         mapper.connect("/cloudpipe/{path_info:.*}", controller=cloudpipe.API())
         super(API, self).__init__(mapper)
 
+    @utils.fix_wsgify_docstr
     @webob.dec.wsgify
     def osapi_versions(self, req):
         """Respond to a request for all OpenStack API versions."""
@@ -94,6 +96,7 @@ class API(wsgi.Router):
                 "attributes": dict(version=["status", "id"])}}
         return wsgi.Serializer(req.environ, metadata).to_content_type(response)
 
+    @utils.fix_wsgify_docstr
     @webob.dec.wsgify
     def ec2api_versions(self, req):
         """Respond to a request for all EC2 versions."""
diff --git a/nova/utils.py b/nova/utils.py
index e7892a212..d7ebe5b4c 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -21,6 +21,7 @@ System-level utilities and helper functions.
 """
 
 import datetime
+import functools
 import inspect
 import logging
 import os
@@ -232,3 +233,10 @@ def utf8(value):
         return value.encode("utf-8")
     assert isinstance(value, str)
     return value
+
+def fix_wsgify_docstr(wsgified_func):
+    """A decorator to re-assign docstrings that webob.dec.wsgify clobbers."""
+    @functools.wraps(wsgified_func.func)
+    def _f(*args, **kwargs):
+        wsgified_func(*args, **kwargs)
+    return _f