From 91afc00513bd2fa6302ea2be35e1f842cbd5fd38 Mon Sep 17 00:00:00 2001 From: Kevin Christopher Henry Date: Thu, 3 Oct 2013 03:20:04 -0400 Subject: 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). --- tests/urlpatterns_reverse/urls.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/urlpatterns_reverse/urls.py') diff --git a/tests/urlpatterns_reverse/urls.py b/tests/urlpatterns_reverse/urls.py index 05b925d1d5..bc30280da0 100644 --- a/tests/urlpatterns_reverse/urls.py +++ b/tests/urlpatterns_reverse/urls.py @@ -62,14 +62,14 @@ with warnings.catch_warnings(record=True): url(r'^(?:foo|bar)(\w+)/$', empty_view, name="disjunction"), # Regression views for #9038. See tests for more details - url(r'arg_view/$', 'kwargs_view'), - url(r'arg_view/(?P[0-9]+)/$', 'kwargs_view'), + url(r'arg_view/$', 'urlpatterns_reverse.views.kwargs_view'), + url(r'arg_view/(?P[0-9]+)/$', 'urlpatterns_reverse.views.kwargs_view'), url(r'absolute_arg_view/(?P[0-9]+)/$', absolute_kwargs_view), url(r'absolute_arg_view/$', absolute_kwargs_view), # Tests for #13154. Mixed syntax to test both ways of defining URLs. - url(r'defaults_view1/(?P[0-9]+)/', 'defaults_view', {'arg2': 1}, name='defaults'), - (r'defaults_view2/(?P[0-9]+)/', 'defaults_view', {'arg2': 2}, 'defaults'), + url(r'defaults_view1/(?P[0-9]+)/', 'urlpatterns_reverse.views.defaults_view', {'arg2': 1}, name='defaults'), + (r'defaults_view2/(?P[0-9]+)/', 'urlpatterns_reverse.views.defaults_view', {'arg2': 2}, 'defaults'), url('^includes/', include(other_patterns)), ) -- cgit v1.3