Use six.wraps

use six.wraps to replace functools.wraps

TrivialFix

Change-Id: If4a15882fbd88b9a6635d5277da9b951b5b3b68d

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 85b93323989ac45dc2ab295996671280d6967019..cdd0d9150cc833c90bd656f2d449c90a4f68978f 100644 (file)
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -120,7 +120,7 @@ def check_instance_state(vm_state=None, task_state=(None,),
         task_state = set(task_state)
 
     def outer(f):
-        @functools.wraps(f)
+        @six.wraps(f)
         def inner(self, context, instance, *args, **kw):
             if vm_state is not None and instance.vm_state not in vm_state:
                 raise exception.InstanceInvalidState(
@@ -148,7 +148,7 @@ def check_instance_state(vm_state=None, task_state=(None,),
 
 
 def check_instance_host(function):
-    @functools.wraps(function)
+    @six.wraps(function)
     def wrapped(self, context, instance, *args, **kwargs):
         if not instance.host:
             raise exception.InstanceNotReady(instance_id=instance.uuid)
@@ -157,7 +157,7 @@ def check_instance_host(function):
 
 
 def check_instance_lock(function):
-    @functools.wraps(function)
+    @six.wraps(function)
     def inner(self, context, instance, *args, **kwargs):
         if instance.locked and not context.is_admin:
             raise exception.InstanceIsLocked(instance_uuid=instance.uuid)
@@ -166,10 +166,10 @@ def check_instance_lock(function):
 
 
 def check_instance_cell(fn):
+    @six.wraps(fn)
     def _wrapped(self, context, instance, *args, **kwargs):
         self._validate_cell(instance)
         return fn(self, context, instance, *args, **kwargs)
-    _wrapped.__name__ = fn.__name__
     return _wrapped