Fixed #21157 -- Fixed problems with ResolverMatch

- Fixed bug in get_callable() that caused resolve() to put a string
  in ResolverMatch.func.
- Made ResolverMatch.url_name match the actual url name (or None).
- Updated tests that used the string value in ResolverMatch.func, and
  added regression tests for this bug.
- Corrected test urls whose dummy view paths caused failures (behavior
  that was previously masked by this bug).

3 files changed, 11 insertions, 6 deletions

diff --git a/tests/middleware/extra_urls.py b/tests/middleware/extra_urls.py
index 3b1fb85604..80f07c5074 100644
--- a/tests/middleware/extra_urls.py
+++ b/tests/middleware/extra_urls.py
@@ -1,7 +1,7 @@
 from django.conf.urls import url
 
 urlpatterns = [
-    url(r'^customurlconf/noslash$', 'view'),
-    url(r'^customurlconf/slash/$', 'view'),
-    url(r'^customurlconf/needsquoting#/$', 'view'),
+    url(r'^customurlconf/noslash$', 'middleware.views.empty_view'),
+    url(r'^customurlconf/slash/$', 'middleware.views.empty_view'),
+    url(r'^customurlconf/needsquoting#/$', 'middleware.views.empty_view'),
 ]
diff --git a/tests/middleware/urls.py b/tests/middleware/urls.py
index c429bb90fe..7d6689590c 100644
--- a/tests/middleware/urls.py
+++ b/tests/middleware/urls.py
@@ -1,7 +1,7 @@
 from django.conf.urls import url
 
 urlpatterns = [
-    url(r'^noslash$', 'view'),
-    url(r'^slash/$', 'view'),
-    url(r'^needsquoting#/$', 'view'),
+    url(r'^noslash$', 'middleware.views.empty_view'),
+    url(r'^slash/$', 'middleware.views.empty_view'),
+    url(r'^needsquoting#/$', 'middleware.views.empty_view'),
 ]
diff --git a/tests/middleware/views.py b/tests/middleware/views.py
new file mode 100755
index 0000000000..c1ee23e893
--- /dev/null
+++ b/tests/middleware/views.py
@@ -0,0 +1,5 @@
+from django.http import HttpResponse

+

+

+def empty_view(request, *args, **kwargs):

+    return HttpResponse('')