summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-10-25 23:00:11 +0000
committerGerrit Code Review <review@openstack.org>2014-10-25 23:00:11 +0000
commita79b1ab59aee7e8c1af6f738b8fa29a9fe1f6cd2 (patch)
tree686a69b4b9a846a1b2c6675c02e75a142b806d92
parent3fa67039027ce59027d2e56ebd64bc8f0c44b347 (diff)
parent761b26024e12ace10fa92805106cd5a0fbdfd3a6 (diff)
downloadoslo-concurrency-a79b1ab59aee7e8c1af6f738b8fa29a9fe1f6cd2.tar.gz
Merge "Use six.wraps"
-rw-r--r--oslo/concurrency/lockutils.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/oslo/concurrency/lockutils.py b/oslo/concurrency/lockutils.py
index 4726fd5..22aae60 100644
--- a/oslo/concurrency/lockutils.py
+++ b/oslo/concurrency/lockutils.py
@@ -28,6 +28,7 @@ import weakref
from oslo.config import cfg
from oslo.config import cfgfilter
+import six
from oslo.concurrency._i18n import _, _LE, _LI
from oslo.concurrency.openstack.common import fileutils
@@ -287,7 +288,7 @@ def synchronized(name, lock_file_prefix=None, external=False, lock_path=None):
"""
def wrap(f):
- @functools.wraps(f)
+ @six.wraps(f)
def inner(*args, **kwargs):
t1 = time.time()
t2 = None