From ff3ec33010ce8ece87523f7cf3ef2e4a0a23006e Mon Sep 17 00:00:00 2001 From: Todd Willey Date: Mon, 15 Nov 2010 21:08:08 -0500 Subject: [PATCH] The docs are just going to be wrong for now. I'll file a bug upstream. --- nova/api/__init__.py | 2 -- nova/utils.py | 7 ------- 2 files changed, 9 deletions(-) diff --git a/nova/api/__init__.py b/nova/api/__init__.py index 1dabd3d21840..7e75445a8831 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 d074cab75134..2970b93bbc61 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