mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-04 10:59:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #24707 -- Improved error reporting for explicitly imported uncallable views

Browse source
This commit is contained in:
Harry 2015-04-24 20:51:26 +01:00 • committed by Markus Holtermann
parent 86aaffa5a3
commit 40768ec29d
4 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/urlpatterns_reverse/erroneous_urls.py
View file

@ -19,8 +19,10 @@ with warnings.catch_warnings():
url(r'erroneous_unqualified/$', 'unqualified_view'),
# View does not exist
url(r'missing_inner/$', 'urlpatterns_reverse.views.missing_view'),
# View is not callable
url(r'uncallable/$', 'urlpatterns_reverse.views.uncallable'),
# View is not a callable (string import; arbitrary Python object)
url(r'uncallable-dotted/$', 'urlpatterns_reverse.views.uncallable'),
# View is not a callable (explicit import; arbitrary Python object)
url(r'uncallable-object/$', views.uncallable),
# Module does not exist
url(r'missing_outer/$', 'urlpatterns_reverse.missing_module.missing_view'),
# Regex contains an error (refs #6170)

3
tests/urlpatterns_reverse/tests.py
View file

@ -762,7 +762,8 @@ class ErroneousViewTests(TestCase):
self.assertRaises(ImportError, self.client.get, '/erroneous_outer/')
self.assertRaises(ViewDoesNotExist, self.client.get, '/missing_inner/')
self.assertRaises(ViewDoesNotExist, self.client.get, '/missing_outer/')
self.assertRaises(ViewDoesNotExist, self.client.get, '/uncallable/')
self.assertRaises(ViewDoesNotExist, self.client.get, '/uncallable-dotted/')
self.assertRaises(ViewDoesNotExist, self.client.get, '/uncallable-object/')
# Regression test for #21157
self.assertRaises(ImportError, self.client.get, '/erroneous_unqualified/')

2
tests/urlpatterns_reverse/views.py
View file

@ -35,7 +35,7 @@ def pass_resolver_match_view(request, *args, **kwargs):
response.resolver_match = request.resolver_match
return response
uncallable = "Can I be a view? Pleeeease?"
uncallable = None # neither a callable nor a string
class ViewClass(object):