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

Removed unused param_dict return from URLResolver.resolve_error_handler(). 

Unused since its introduction in ed114e1510.
This commit is contained in:
Adam Johnson 2020-06-22 20:28:56 +01:00 committed by GitHub
parent be534348f5
commit 6e5041f57c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/core/handlers/exception.py
View File

@ -117,8 +117,8 @@ def response_for_exception(request, exc):
def get_exception_response(request, resolver, status_code, exception): def get_exception_response(request, resolver, status_code, exception):
try: try:
callback, param_dict = resolver.resolve_error_handler(status_code) callback = resolver.resolve_error_handler(status_code)
response = callback(request, **{**param_dict, 'exception': exception}) response = callback(request, exception=exception)
except Exception: except Exception:
signals.got_request_exception.send(sender=None, request=request) signals.got_request_exception.send(sender=None, request=request)
response = handle_uncaught_exception(request, resolver, sys.exc_info()) response = handle_uncaught_exception(request, resolver, sys.exc_info())
@ -138,5 +138,5 @@ def handle_uncaught_exception(request, resolver, exc_info):
return debug.technical_500_response(request, *exc_info) return debug.technical_500_response(request, *exc_info)
# Return an HttpResponse that displays a friendly error message. # Return an HttpResponse that displays a friendly error message.
callback, param_dict = resolver.resolve_error_handler(500) callback = resolver.resolve_error_handler(500)
return callback(request, **param_dict) return callback(request)

4
django/urls/resolvers.py
View File

@ -416,7 +416,7 @@ class URLResolver:
# which takes (request). # which takes (request).
for status_code, num_parameters in [(400, 2), (403, 2), (404, 2), (500, 1)]: for status_code, num_parameters in [(400, 2), (403, 2), (404, 2), (500, 1)]:
try: try:
handler, param_dict = self.resolve_error_handler(status_code) handler = self.resolve_error_handler(status_code)
except (ImportError, ViewDoesNotExist) as e: except (ImportError, ViewDoesNotExist) as e:
path = getattr(self.urlconf_module, 'handler%s' % status_code) path = getattr(self.urlconf_module, 'handler%s' % status_code)
msg = ( msg = (
@ -605,7 +605,7 @@ class URLResolver:
# django.conf.urls imports this file. # django.conf.urls imports this file.
from django.conf import urls from django.conf import urls
callback = getattr(urls, 'handler%s' % view_type) callback = getattr(urls, 'handler%s' % view_type)
return get_callable(callback), {} return get_callable(callback)
def reverse(self, lookup_view, *args, **kwargs): def reverse(self, lookup_view, *args, **kwargs):
return self._reverse_with_prefix(lookup_view, '', *args, **kwargs) return self._reverse_with_prefix(lookup_view, '', *args, **kwargs)

6
tests/urlpatterns_reverse/tests.py
View File

@ -1065,16 +1065,14 @@ class ErrorHandlerResolutionTests(SimpleTestCase):
self.callable_resolver = URLResolver(RegexPattern(r'^$'), urlconf_callables) self.callable_resolver = URLResolver(RegexPattern(r'^$'), urlconf_callables)
def test_named_handlers(self): def test_named_handlers(self):
handler = (empty_view, {})
for code in [400, 404, 500]: for code in [400, 404, 500]:
with self.subTest(code=code): with self.subTest(code=code):
self.assertEqual(self.resolver.resolve_error_handler(code), handler) self.assertEqual(self.resolver.resolve_error_handler(code), empty_view)
def test_callable_handlers(self): def test_callable_handlers(self):
handler = (empty_view, {})
for code in [400, 404, 500]: for code in [400, 404, 500]:
with self.subTest(code=code): with self.subTest(code=code):
self.assertEqual(self.callable_resolver.resolve_error_handler(code), handler) self.assertEqual(self.callable_resolver.resolve_error_handler(code), empty_view)
@override_settings(ROOT_URLCONF='urlpatterns_reverse.urls_without_handlers') @override_settings(ROOT_URLCONF='urlpatterns_reverse.urls_without_handlers')