Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
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
  • Loading branch information...
commit d0032458a26bdd51729ce6ce372ec2c8094a96b6 1 parent 5794111
@gdub gdub authored
View
2  django/utils/decorators.py
@@ -41,7 +41,7 @@ def _wrapped_view(request, *args, **kwargs):
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:
View
13 tests/regressiontests/utils/decorators.py
@@ -0,0 +1,13 @@
+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/')
View
1  tests/regressiontests/utils/tests.py
@@ -8,6 +8,7 @@
import timesince
import datastructures
+from decorators import DecoratorFromMiddlewareTests
# Extra tests
__test__ = {
View
7 tests/regressiontests/utils/urls.py
@@ -0,0 +1,7 @@
+from django.conf.urls.defaults import *
+
+import views
+
+urlpatterns = patterns('',
+ (r'^xview/$', views.xview),
+)
View
10 tests/regressiontests/utils/views.py
@@ -0,0 +1,10 @@
+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)
View
4 tests/urls.py
@@ -11,10 +11,12 @@
# test urlconf for {% url %} template tag
(r'^url_tag/', include('regressiontests.templates.urls')),
-
+
# django built-in views
(r'^views/', include('regressiontests.views.urls')),
# test urlconf for middleware tests
(r'^middleware/', include('regressiontests.middleware.urls')),
+
+ (r'^utils/', include('regressiontests.utils.urls')),
)
Please sign in to comment.
Something went wrong with that request. Please try again.