Django

Code

Changeset 7269

Show
Ignore:
Timestamp:
03/17/08 12:47:34 (4 months ago)
Author:
gwilson
Message:

Fixed #6679 -- In decorator_from_middleware, don't unpack arguments when calling a middleware's
process_view method, thanks Gulopine.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/utils/decorators.py

    r7153 r7269  
    4242                    return result 
    4343            if hasattr(middleware, 'process_view'): 
    44                 result = middleware.process_view(request, view_func, *args, **kwargs) 
     44                result = middleware.process_view(request, view_func, args, kwargs) 
    4545                if result is not None: 
    4646                    return result 

  • django/trunk/tests/regressiontests/utils/tests.py

    r6751 r7269  
    99import timesince 
    1010import datastructures 
     11from decorators import DecoratorFromMiddlewareTests 
    1112 
    1213# Extra tests 

  • django/trunk/tests/urls.py

    r6852 r7269  
    1212    # test urlconf for {% url %} template tag 
    1313    (r'^url_tag/', include('regressiontests.templates.urls')), 
    14      
     14 
    1515    # django built-in views 
    1616    (r'^views/', include('regressiontests.views.urls')), 
    …… 
    1818    # test urlconf for middleware tests 
    1919    (r'^middleware/', include('regressiontests.middleware.urls')), 
     20 
     21    (r'^utils/', include('regressiontests.utils.urls')), 
    2022)