merge in trunk

1 files changed, 8 insertions, 0 deletions

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