summaryrefslogtreecommitdiffstats
path: root/nova/utils.py
diff options
context:
space:
mode:
authorSoren Hansen <soren@linux2go.dk>2011-03-01 20:49:46 +0100
committerSoren Hansen <soren@linux2go.dk>2011-03-01 20:49:46 +0100
commitbe9004ffa4c70358c8edda1f33ffe7ba7e1ae1ee (patch)
tree4833b57a2735900bc0fcdcd607365a273e631ca7 /nova/utils.py
parentd5736e925f288462f6325130be0af49f0ace5884 (diff)
downloadnova-be9004ffa4c70358c8edda1f33ffe7ba7e1ae1ee.tar.gz
nova-be9004ffa4c70358c8edda1f33ffe7ba7e1ae1ee.tar.xz
nova-be9004ffa4c70358c8edda1f33ffe7ba7e1ae1ee.zip
Use functools.wraps to make sure wrapped method's metadata (docstring and name) doesn't get mangled.
Diffstat (limited to 'nova/utils.py')
-rw-r--r--nova/utils.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/utils.py b/nova/utils.py
index 48f12350f..9929e6fef 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -23,11 +23,14 @@ System-level utilities and helper functions.
import base64
import datetime
+import functools
import inspect
import json
import lockfile
+import netaddr
import os
import random
+import re
import socket
import string
import struct
@@ -35,8 +38,6 @@ import sys
import time
import types
from xml.sax import saxutils
-import re
-import netaddr
from eventlet import event
from eventlet import greenthread
@@ -496,6 +497,7 @@ def loads(s):
def synchronized(name):
def wrap(f):
+ @functools.wraps(f)
def inner(*args, **kwargs):
lock = lockfile.FileLock(os.path.join(FLAGS.lock_path,
'nova-%s.lock' % name))