Use six.wraps instead of functools.wraps

The six module provides a helper wraps function that correctly
tracks the original wrapped function in python 2.x and 3.x so
use it where we can so that we maintain better compatability with
3.x

Change-Id: Ifa994bf63153f58f0aa1f6203a963ac7312ac2b1

2 files changed, 3 insertions, 4 deletions

diff --git a/oslo/db/api.py b/oslo/db/api.py
index 5527e64..8b7bdeb 100644
--- a/oslo/db/api.py
+++ b/oslo/db/api.py
@@ -23,12 +23,12 @@ takes no arguments. The method can return any object that implements DB
 API methods.
 """
 
-import functools
 import logging
 import threading
 import time
 
 from oslo.utils import importutils
+import six
 
 from oslo.db._i18n import _LE
 from oslo.db import exception
@@ -93,7 +93,7 @@ class wrap_db_retry(object):
         self.max_retry_interval = max_retry_interval
 
     def __call__(self, f):
-        @functools.wraps(f)
+        @six.wraps(f)
         def wrapper(*args, **kwargs):
             next_interval = self.retry_interval
             remaining = self.max_retries
diff --git a/oslo/db/sqlalchemy/test_base.py b/oslo/db/sqlalchemy/test_base.py
index 849e726..52f2673 100644
--- a/oslo/db/sqlalchemy/test_base.py
+++ b/oslo/db/sqlalchemy/test_base.py
@@ -14,7 +14,6 @@
 # under the License.
 
 import abc
-import functools
 import os
 
 import fixtures
@@ -83,7 +82,7 @@ def backend_specific(*dialects):
     ::dialects: list of dialects names under which the test will be launched.
     """
     def wrap(f):
-        @functools.wraps(f)
+        @six.wraps(f)
         def ins_wrap(self):
             if not set(dialects).issubset(ALLOWED_DIALECTS):
                 raise ValueError(