summaryrefslogtreecommitdiffstats
path: root/Lib/functools.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-08-04 18:28:02 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-08-04 18:28:02 (GMT)
commit560f7647ce5991140e215a7ac775130798c92dc8 (patch)
tree7b19296ddf3d8a0d111766226cff9367f77bd619 /Lib/functools.py
parent5626eec0c2f62999967eff0ab6aa8ad329e8571b (diff)
downloadcpython-560f7647ce5991140e215a7ac775130798c92dc8.zip
cpython-560f7647ce5991140e215a7ac775130798c92dc8.tar.gz
cpython-560f7647ce5991140e215a7ac775130798c92dc8.tar.bz2
Issue #8814: function annotations (the `__annotations__` attribute)
are now included in the set of attributes copied by default by functools.wraps and functools.update_wrapper. Patch by Terrence Cole.
Diffstat (limited to 'Lib/functools.py')
-rw-r--r--Lib/functools.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/functools.py b/Lib/functools.py
index 863706d..e244070 100644
--- a/Lib/functools.py
+++ b/Lib/functools.py
@@ -19,7 +19,7 @@ from operator import itemgetter
# update_wrapper() and wraps() are tools to help write
# wrapper functions that can handle naive introspection
-WRAPPER_ASSIGNMENTS = ('__module__', '__name__', '__doc__')
+WRAPPER_ASSIGNMENTS = ('__module__', '__name__', '__doc__', '__annotations__')
WRAPPER_UPDATES = ('__dict__',)
def update_wrapper(wrapper,
wrapped,
@@ -37,7 +37,8 @@ def update_wrapper(wrapper,
function (defaults to functools.WRAPPER_UPDATES)
"""
for attr in assigned:
- setattr(wrapper, attr, getattr(wrapped, attr))
+ if hasattr(wrapped, attr):
+ setattr(wrapper, attr, getattr(wrapped, attr))
for attr in updated:
getattr(wrapper, attr).update(getattr(wrapped, attr, {}))
# Return the wrapper so this can be used as a decorator via partial()