From 00715e147c549ad06c072460e0270ae591848b26 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Fri, 13 Feb 2015 12:44:50 -0800
Subject: [PATCH] Use six.wraps for py2/py3 compat

The six.wraps adds a little benefit over using
functools.wraps so we might as well just use it.

Change-Id: I00dd59b3c0422f4b2daba4517af76caf4c045654
---
 oslo_versionedobjects/base.py      | 7 +++----
 oslo_versionedobjects/exception.py | 5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/oslo_versionedobjects/base.py b/oslo_versionedobjects/base.py
index f495c9db..fe7dafc4 100644
--- a/oslo_versionedobjects/base.py
+++ b/oslo_versionedobjects/base.py
@@ -18,7 +18,6 @@ import collections
 import contextlib
 import copy
 import datetime
-import functools
 import logging
 import traceback
 
@@ -157,7 +156,7 @@ class VersionedObjectRegistry(object):
 # requested action and the result will be returned here.
 def remotable_classmethod(fn):
     """Decorator for remotable classmethods."""
-    @functools.wraps(fn)
+    @six.wraps(fn)
     def wrapper(cls, context, *args, **kwargs):
         if VersionedObject.indirection_api:
             result = VersionedObject.indirection_api.object_class_action(
@@ -182,7 +181,7 @@ def remotable_classmethod(fn):
 # "orphaned" and remotable methods cannot be called.
 def remotable(fn):
     """Decorator for remotable object methods."""
-    @functools.wraps(fn)
+    @six.wraps(fn)
     def wrapper(self, *args, **kwargs):
         ctxt = self._context
         if ctxt is None:
@@ -879,5 +878,5 @@ def serialize_args(fn):
     # NOTE(danms): Make this discoverable
     wrapper.remotable = getattr(fn, 'remotable', False)
     wrapper.original_fn = fn
-    return (functools.wraps(fn)(wrapper) if hasattr(fn, '__call__')
+    return (six.wraps(fn)(wrapper) if hasattr(fn, '__call__')
             else classmethod(wrapper))
diff --git a/oslo_versionedobjects/exception.py b/oslo_versionedobjects/exception.py
index c844e891..b9c292a7 100644
--- a/oslo_versionedobjects/exception.py
+++ b/oslo_versionedobjects/exception.py
@@ -22,7 +22,6 @@ SHOULD include dedicated exception logging.
 
 """
 
-import functools
 import logging
 import sys
 
@@ -80,7 +79,7 @@ def wrap_exception(notifier=None, get_notifier=None):
                         payload.update({'args': cleansed})
 
                         # If f has multiple decorators, they must use
-                        # functools.wraps to ensure the name is
+                        # six.wraps to ensure the name is
                         # propagated.
                         event_type = f.__name__
 
@@ -88,7 +87,7 @@ def wrap_exception(notifier=None, get_notifier=None):
                                                            event_type,
                                                            payload)
 
-        return functools.wraps(f)(wrapped)
+        return six.wraps(f)(wrapped)
     return inner