mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity

Corrected misleading comment from [5619]. Not sure what I was smoking at the 

time.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5631 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2007-07-07 18:39:23 +00:00
parent 8c85ddf306
commit 4c011e6f36
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/utils/decorators.py
View File

@ -8,6 +8,9 @@ def decorator_from_middleware(middleware_class):
lets you use middleware functionality on a per-view basis. lets you use middleware functionality on a per-view basis.
""" """
def _decorator_from_middleware(*args, **kwargs): def _decorator_from_middleware(*args, **kwargs):
# For historical reasons, these "decorators" are also called as
# dec(func, *args) instead of dec(*args)(func). We handle both forms
# for backwards compatibility.
has_func = True has_func = True
try: try:
view_func = kwargs.pop('view_func') view_func = kwargs.pop('view_func')
@ -17,9 +20,7 @@ def decorator_from_middleware(middleware_class):
else: else:
has_func = False has_func = False
if not (has_func and isinstance(view_func, types.FunctionType)): if not (has_func and isinstance(view_func, types.FunctionType)):
# For historical reasons, these decorators are also called as # We are being called as a decorator.
# dec(func, *args) instead of dec(*args)(func). This branch handles
# the backwards compatibility.
if has_func: if has_func:
args = (view_func,) + args args = (view_func,) + args
middleware = middleware_class(*args, **kwargs) middleware = middleware_class(*args, **kwargs)