summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-12-09 10:58:23 -0500
committerBenjamin Peterson <benjamin@python.org>2014-12-09 10:58:23 -0500
commit47cbc4fe3fe561999870d660347e8b587b3e1077 (patch)
tree428b7fd1adb81552684515449797c16760f4ff8d
parentd00e00a327483379c13dc8789413d4ef31392259 (diff)
parent9f4c34a72ee52326b17cab92cd008399b920a5f6 (diff)
downloadsix-47cbc4fe3fe561999870d660347e8b587b3e1077.tar.gz
Merged in harlowja/six (pull request #58)
Ensure wraps passes along the assigned + updated params
-rw-r--r--six.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/six.py b/six.py
index a8cdb22..11843f8 100644
--- a/six.py
+++ b/six.py
@@ -729,7 +729,9 @@ if sys.version_info[0:2] < (3, 4):
def wraps(wrapped, assigned=functools.WRAPPER_ASSIGNMENTS,
updated=functools.WRAPPER_UPDATES):
def wrapper(f):
- f = functools.wraps(wrapped)(f)
+ f = functools.wraps(wrapped,
+ assigned=assigned,
+ updated=updated)(f)
f.__wrapped__ = wrapped
return f
return wrapper