summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Willey <todd@ansolabs.com>2010-11-15 21:08:08 -0500
committerTodd Willey <todd@ansolabs.com>2010-11-15 21:08:08 -0500
commitff3ec33010ce8ece87523f7cf3ef2e4a0a23006e (patch)
tree12ac1e5c2c4cd3223d94a9456612627d1c3cc1d3
parentf3744b0de85a1bc5be77f37a770144d3244bca86 (diff)
downloadnova-ff3ec33010ce8ece87523f7cf3ef2e4a0a23006e.tar.gz
nova-ff3ec33010ce8ece87523f7cf3ef2e4a0a23006e.tar.xz
nova-ff3ec33010ce8ece87523f7cf3ef2e4a0a23006e.zip
The docs are just going to be wrong for now. I'll file a bug upstream.
-rw-r--r--nova/api/__init__.py2
-rw-r--r--nova/utils.py7
2 files changed, 0 insertions, 9 deletions
diff --git a/nova/api/__init__.py b/nova/api/__init__.py
index 1dabd3d21..7e75445a8 100644
--- a/nova/api/__init__.py
+++ b/nova/api/__init__.py
@@ -84,7 +84,6 @@ 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."""
@@ -96,7 +95,6 @@ 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 d074cab75..2970b93bb 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -233,10 +233,3 @@ 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."""
- wsgified_func.__doc__ = wsgified_func.func.__doc__
- wsgified_func.func_name = wsgified_func.func.func_name
- return wsgified_func