accept assigned and updated parameters for wraps() (fixes #85)

3 files changed, 5 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index 698db3c..b89dca5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,8 @@ This file lists the changes in each six version.
 Development version
 -------------------
 
+- Issue #85: Always accept *updated* and *assigned* arguments for wraps().
+
 - Issue #86: In reraise(), instantiate the exception if the second argument is
   None.
 
diff --git a/documentation/index.rst b/documentation/index.rst
index 2de3622..e2bdcc3 100644
--- a/documentation/index.rst
+++ b/documentation/index.rst
@@ -222,7 +222,7 @@ functions and methods is the stdlib :mod:`py3:inspect` module.
    aliased to :class:`py3:object`.)
 
 
-.. function:: wraps(wrapped)
+.. function:: wraps(wrapped, assigned=functools.WRAPPER_ASSIGNMENTS, updated=functools.WRAPPER_UPDATES)
 
    This is exactly the :func:`py3:functools.wraps` decorator, but it sets the
    ``__wrapped__`` attribute on what it decorates as :func:`py3:functools.wraps`
diff --git a/six.py b/six.py
index 1cc90b0..7c285b1 100644
--- a/six.py
+++ b/six.py
@@ -692,7 +692,8 @@ if print_ is None:
 _add_doc(reraise, """Reraise an exception.""")
 
 if sys.version_info[0:2] < (3, 4):
-    def wraps(wrapped):
+    def wraps(wrapped, assigned=functools.WRAPPER_ASSIGNMENTS,
+              updated=functools.WRAPPER_UPDATES):
         def wrapper(f):
             f = functools.wraps(wrapped)(f)
             f.__wrapped__ = wrapped