Commit d0032458 authored by Gary Wilson Jr's avatar Gary Wilson Jr
Browse files

Fixed #6679 -- In `decorator_from_middleware`, don't unpack arguments when calling a middleware's 

`process_view` method, thanks Gulopine.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7269 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 5794111a

django/utils/decorators.py

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ def decorator_from_middleware(middleware_class): 
                if result is not None:

                    return result

            if hasattr(middleware, 'process_view'):

                result = middleware.process_view(request, view_func, *args, **kwargs)

                result = middleware.process_view(request, view_func, args, kwargs)

                if result is not None:

                    return result

            try:

tests/regressiontests/utils/decorators.py

0 → 100644
+13 −0
Original line number Diff line number Diff line 
from django.test import TestCase



class DecoratorFromMiddlewareTests(TestCase):

    """

    Tests for view decorators created using

    ``django.utils.decorators.decorator_from_middleware``.

    """



    def test_process_view_middleware(self):

        """

        Test a middleware that implements process_view.

        """

        self.client.get('/utils/xview/')

tests/regressiontests/utils/tests.py

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ from django.utils import html, checksums 


import timesince

import datastructures

from decorators import DecoratorFromMiddlewareTests



# Extra tests

__test__ = {

tests/regressiontests/utils/urls.py

0 → 100644
+7 −0
Original line number Diff line number Diff line 
from django.conf.urls.defaults import *



import views



urlpatterns = patterns('',

    (r'^xview/$', views.xview),

)

tests/regressiontests/utils/views.py

0 → 100644
+10 −0
Original line number Diff line number Diff line 
from django.http import HttpResponse

from django.utils.decorators import decorator_from_middleware

from django.middleware.doc import XViewMiddleware





xview_dec = decorator_from_middleware(XViewMiddleware)



def xview(request):

    return HttpResponse()

xview = xview_dec(xview)