test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Corrected 'name' of functions wrapped with method_decorator 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13249 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Luke Plant 2010-05-13 11:11:27 +00:00
parent 8e7d2d2e68
commit b29b0f8cac
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/utils/decorators.py
View File

@ -22,7 +22,7 @@ def method_decorator(decorator):
return wraps(func)(_wrapper) return wraps(func)(_wrapper)
update_wrapper(_dec, decorator) update_wrapper(_dec, decorator)
# Change the name to aid debugging. # Change the name to aid debugging.
_dec.__name__ = 'method_dec(%s)' % decorator.__name__ _dec.__name__ = 'method_decorator(%s)' % decorator.__name__
return _dec return _dec
@ -50,6 +50,7 @@ def decorator_from_middleware(middleware_class):
""" """
return make_middleware_decorator(middleware_class)() return make_middleware_decorator(middleware_class)()
def available_attrs(fn): def available_attrs(fn):
""" """
Return the list of functools-wrappable attributes on a callable. Return the list of functools-wrappable attributes on a callable.
@ -57,6 +58,7 @@ def available_attrs(fn):
""" """
return tuple(a for a in WRAPPER_ASSIGNMENTS if hasattr(fn, a)) return tuple(a for a in WRAPPER_ASSIGNMENTS if hasattr(fn, a))
def make_middleware_decorator(middleware_class): def make_middleware_decorator(middleware_class):
def _make_decorator(*m_args, **m_kwargs): def _make_decorator(*m_args, **m_kwargs):
middleware = middleware_class(*m_args, **m_kwargs) middleware = middleware_class(*m_args, **m_kwargs)