summaryrefslogtreecommitdiff
path: root/tests/urlpatterns_reverse
diff options
context:
space:
mode:
Diffstat (limited to 'tests/urlpatterns_reverse')
-rw-r--r--tests/urlpatterns_reverse/erroneous_urls.py10
-rw-r--r--tests/urlpatterns_reverse/extra_urls.py4
-rw-r--r--tests/urlpatterns_reverse/included_named_urls.py2
-rw-r--r--tests/urlpatterns_reverse/included_namespace_urls.py6
-rw-r--r--tests/urlpatterns_reverse/named_urls.py2
-rw-r--r--tests/urlpatterns_reverse/namespace_urls.py14
-rw-r--r--tests/urlpatterns_reverse/tests.py38
-rw-r--r--tests/urlpatterns_reverse/urls.py4
-rw-r--r--tests/urlpatterns_reverse/urls_error_handlers.py4
9 files changed, 42 insertions, 42 deletions
diff --git a/tests/urlpatterns_reverse/erroneous_urls.py b/tests/urlpatterns_reverse/erroneous_urls.py
index d1e4f3db5d..ac6b6f7cb3 100644
--- a/tests/urlpatterns_reverse/erroneous_urls.py
+++ b/tests/urlpatterns_reverse/erroneous_urls.py
@@ -2,15 +2,15 @@ from django.conf.urls import patterns, url
urlpatterns = patterns('',
# View has erroneous import
- url(r'erroneous_inner/$', 'regressiontests.urlpatterns_reverse.views.erroneous_view'),
+ url(r'erroneous_inner/$', 'urlpatterns_reverse.views.erroneous_view'),
# Module has erroneous import
- url(r'erroneous_outer/$', 'regressiontests.urlpatterns_reverse.erroneous_views_module.erroneous_view'),
+ url(r'erroneous_outer/$', 'urlpatterns_reverse.erroneous_views_module.erroneous_view'),
# View does not exist
- url(r'missing_inner/$', 'regressiontests.urlpatterns_reverse.views.missing_view'),
+ url(r'missing_inner/$', 'urlpatterns_reverse.views.missing_view'),
# View is not callable
- url(r'uncallable/$', 'regressiontests.urlpatterns_reverse.views.uncallable'),
+ url(r'uncallable/$', 'urlpatterns_reverse.views.uncallable'),
# Module does not exist
- url(r'missing_outer/$', 'regressiontests.urlpatterns_reverse.missing_module.missing_view'),
+ url(r'missing_outer/$', 'urlpatterns_reverse.missing_module.missing_view'),
# Regex contains an error (refs #6170)
url(r'(regex_error/$', 'regressiontestes.urlpatterns_reverse.views.empty_view'),
)
diff --git a/tests/urlpatterns_reverse/extra_urls.py b/tests/urlpatterns_reverse/extra_urls.py
index c737f8b5c4..d3a04e6b31 100644
--- a/tests/urlpatterns_reverse/extra_urls.py
+++ b/tests/urlpatterns_reverse/extra_urls.py
@@ -12,6 +12,6 @@ from .views import empty_view
urlpatterns = patterns('',
url(r'^e-places/(\d+)/$', empty_view, name='extra-places'),
url(r'^e-people/(?P<name>\w+)/$', empty_view, name="extra-people"),
- url('', include('regressiontests.urlpatterns_reverse.included_urls2')),
- url(r'^prefix/(?P<prefix>\w+)/', include('regressiontests.urlpatterns_reverse.included_urls2')),
+ url('', include('urlpatterns_reverse.included_urls2')),
+ url(r'^prefix/(?P<prefix>\w+)/', include('urlpatterns_reverse.included_urls2')),
)
diff --git a/tests/urlpatterns_reverse/included_named_urls.py b/tests/urlpatterns_reverse/included_named_urls.py
index af03097df1..353aed255e 100644
--- a/tests/urlpatterns_reverse/included_named_urls.py
+++ b/tests/urlpatterns_reverse/included_named_urls.py
@@ -9,6 +9,6 @@ urlpatterns = patterns('',
url(r'^$', empty_view, name="named-url3"),
url(r'^extra/(?P<extra>\w+)/$', empty_view, name="named-url4"),
url(r'^(?P<one>\d+)|(?P<two>\d+)/$', empty_view),
- (r'^included/', include('regressiontests.urlpatterns_reverse.included_named_urls2')),
+ (r'^included/', include('urlpatterns_reverse.included_named_urls2')),
)
diff --git a/tests/urlpatterns_reverse/included_namespace_urls.py b/tests/urlpatterns_reverse/included_namespace_urls.py
index 8fe69ab8ed..7a2096ecd9 100644
--- a/tests/urlpatterns_reverse/included_namespace_urls.py
+++ b/tests/urlpatterns_reverse/included_namespace_urls.py
@@ -8,7 +8,7 @@ from .views import view_class_instance
testobj3 = URLObject('testapp', 'test-ns3')
-urlpatterns = patterns('regressiontests.urlpatterns_reverse.views',
+urlpatterns = patterns('urlpatterns_reverse.views',
url(r'^normal/$', 'empty_view', name='inc-normal-view'),
url(r'^normal/(?P<arg1>\d+)/(?P<arg2>\d+)/$', 'empty_view', name='inc-normal-view'),
@@ -20,7 +20,7 @@ urlpatterns = patterns('regressiontests.urlpatterns_reverse.views',
url(r'^view_class/(?P<arg1>\d+)/(?P<arg2>\d+)/$', view_class_instance, name='inc-view-class'),
(r'^test3/', include(testobj3.urls)),
- (r'^ns-included3/', include('regressiontests.urlpatterns_reverse.included_urls', namespace='inc-ns3')),
- (r'^ns-included4/', include('regressiontests.urlpatterns_reverse.namespace_urls', namespace='inc-ns4')),
+ (r'^ns-included3/', include('urlpatterns_reverse.included_urls', namespace='inc-ns3')),
+ (r'^ns-included4/', include('urlpatterns_reverse.namespace_urls', namespace='inc-ns4')),
)
diff --git a/tests/urlpatterns_reverse/named_urls.py b/tests/urlpatterns_reverse/named_urls.py
index 8df336cf4b..3290cab29c 100644
--- a/tests/urlpatterns_reverse/named_urls.py
+++ b/tests/urlpatterns_reverse/named_urls.py
@@ -9,5 +9,5 @@ urlpatterns = patterns('',
url(r'^$', empty_view, name="named-url1"),
url(r'^extra/(?P<extra>\w+)/$', empty_view, name="named-url2"),
url(r'^(?P<one>\d+)|(?P<two>\d+)/$', empty_view),
- (r'^included/', include('regressiontests.urlpatterns_reverse.included_named_urls')),
+ (r'^included/', include('urlpatterns_reverse.included_named_urls')),
)
diff --git a/tests/urlpatterns_reverse/namespace_urls.py b/tests/urlpatterns_reverse/namespace_urls.py
index ab2e77af24..cf960070ec 100644
--- a/tests/urlpatterns_reverse/namespace_urls.py
+++ b/tests/urlpatterns_reverse/namespace_urls.py
@@ -25,7 +25,7 @@ default_testobj = URLObject('testapp', 'testapp')
otherobj1 = URLObject('nodefault', 'other-ns1')
otherobj2 = URLObject('nodefault', 'other-ns2')
-urlpatterns = patterns('regressiontests.urlpatterns_reverse.views',
+urlpatterns = patterns('urlpatterns_reverse.views',
url(r'^normal/$', 'empty_view', name='normal-view'),
url(r'^normal/(?P<arg1>\d+)/(?P<arg2>\d+)/$', 'empty_view', name='normal-view'),
url(r'^resolver_match/$', 'pass_resolver_match_view', name='test-resolver-match'),
@@ -47,13 +47,13 @@ urlpatterns = patterns('regressiontests.urlpatterns_reverse.views',
(r'^other1/', include(otherobj1.urls)),
(r'^other[246]/', include(otherobj2.urls)),
- (r'^ns-included[135]/', include('regressiontests.urlpatterns_reverse.included_namespace_urls', namespace='inc-ns1')),
- (r'^ns-included2/', include('regressiontests.urlpatterns_reverse.included_namespace_urls', namespace='inc-ns2')),
+ (r'^ns-included[135]/', include('urlpatterns_reverse.included_namespace_urls', namespace='inc-ns1')),
+ (r'^ns-included2/', include('urlpatterns_reverse.included_namespace_urls', namespace='inc-ns2')),
- (r'^included/', include('regressiontests.urlpatterns_reverse.included_namespace_urls')),
- (r'^inc(?P<outer>\d+)/', include('regressiontests.urlpatterns_reverse.included_urls', namespace='inc-ns5')),
+ (r'^included/', include('urlpatterns_reverse.included_namespace_urls')),
+ (r'^inc(?P<outer>\d+)/', include('urlpatterns_reverse.included_urls', namespace='inc-ns5')),
- (r'^ns-outer/(?P<outer>\d+)/', include('regressiontests.urlpatterns_reverse.included_namespace_urls', namespace='inc-outer')),
+ (r'^ns-outer/(?P<outer>\d+)/', include('urlpatterns_reverse.included_namespace_urls', namespace='inc-outer')),
- (r'^\+\\\$\*/', include('regressiontests.urlpatterns_reverse.namespace_urls', namespace='special')),
+ (r'^\+\\\$\*/', include('urlpatterns_reverse.namespace_urls', namespace='special')),
)
diff --git a/tests/urlpatterns_reverse/tests.py b/tests/urlpatterns_reverse/tests.py
index 9777710daf..f6da4b2692 100644
--- a/tests/urlpatterns_reverse/tests.py
+++ b/tests/urlpatterns_reverse/tests.py
@@ -30,8 +30,8 @@ resolve_test_data = (
('/included/mixed_args/42/37/', 'inc-mixed-args', None, '', views.empty_view, tuple(), {'arg2': '37'}),
# Unnamed views will be resolved to the function/class name
- ('/unnamed/normal/42/37/', 'regressiontests.urlpatterns_reverse.views.empty_view', None, '', views.empty_view, tuple(), {'arg1': '42', 'arg2': '37'}),
- ('/unnamed/view_class/42/37/', 'regressiontests.urlpatterns_reverse.views.ViewClass', None, '', views.view_class_instance, tuple(), {'arg1': '42', 'arg2': '37'}),
+ ('/unnamed/normal/42/37/', 'urlpatterns_reverse.views.empty_view', None, '', views.empty_view, tuple(), {'arg1': '42', 'arg2': '37'}),
+ ('/unnamed/view_class/42/37/', 'urlpatterns_reverse.views.ViewClass', None, '', views.view_class_instance, tuple(), {'arg1': '42', 'arg2': '37'}),
# If you have no kwargs, you get an args list.
('/no_kwargs/42/37/', 'no-kwargs', None, '', views.empty_view, ('42','37'), {}),
@@ -131,8 +131,8 @@ test_data = (
# correct view for the arguments provided.
('kwargs_view', '/arg_view/', [], {}),
('kwargs_view', '/arg_view/10/', [], {'arg1':10}),
- ('regressiontests.urlpatterns_reverse.views.absolute_kwargs_view', '/absolute_arg_view/', [], {}),
- ('regressiontests.urlpatterns_reverse.views.absolute_kwargs_view', '/absolute_arg_view/10/', [], {'arg1':10}),
+ ('urlpatterns_reverse.views.absolute_kwargs_view', '/absolute_arg_view/', [], {}),
+ ('urlpatterns_reverse.views.absolute_kwargs_view', '/absolute_arg_view/10/', [], {'arg1':10}),
('non_path_include', '/includes/non_path_include/', [], {}),
# Tests for #13154
@@ -143,7 +143,7 @@ test_data = (
)
class NoURLPatternsTests(TestCase):
- urls = 'regressiontests.urlpatterns_reverse.no_urls'
+ urls = 'urlpatterns_reverse.no_urls'
def test_no_urls_exception(self):
"""
@@ -152,11 +152,11 @@ class NoURLPatternsTests(TestCase):
resolver = RegexURLResolver(r'^$', self.urls)
self.assertRaisesMessage(ImproperlyConfigured,
- "The included urlconf regressiontests.urlpatterns_reverse.no_urls "\
+ "The included urlconf urlpatterns_reverse.no_urls "\
"doesn't have any patterns in it", getattr, resolver, 'url_patterns')
class URLPatternReverse(TestCase):
- urls = 'regressiontests.urlpatterns_reverse.urls'
+ urls = 'urlpatterns_reverse.urls'
def test_urlpattern_reverse(self):
for name, expected, args, kwargs in test_data:
@@ -190,7 +190,7 @@ class ResolverTests(unittest.TestCase):
(#17892).
"""
# Pick a resolver from a namespaced urlconf
- resolver = get_resolver('regressiontests.urlpatterns_reverse.namespace_urls')
+ resolver = get_resolver('urlpatterns_reverse.namespace_urls')
sub_resolver = resolver.namespace_dict['test-ns1'][1]
self.assertIn('<RegexURLPattern list>', repr(sub_resolver))
@@ -214,7 +214,7 @@ class ResolverTests(unittest.TestCase):
exception contains a list in the right format for printing out in
the DEBUG 404 page with both the patterns and URL names, if available.
"""
- urls = 'regressiontests.urlpatterns_reverse.named_urls'
+ urls = 'urlpatterns_reverse.named_urls'
# this list matches the expected URL types and names returned when
# you try to resolve a non-existent URL in the first level of included
# URLs in named_urls.py (e.g., '/included/non-existent-url')
@@ -245,7 +245,7 @@ class ResolverTests(unittest.TestCase):
self.assertEqual(t.name, e['name'], 'Wrong URL name. Expected "%s", got "%s".' % (e['name'], t.name))
class ReverseLazyTest(TestCase):
- urls = 'regressiontests.urlpatterns_reverse.reverse_lazy_urls'
+ urls = 'urlpatterns_reverse.reverse_lazy_urls'
def test_redirect_with_lazy_reverse(self):
response = self.client.get('/redirect/')
@@ -260,7 +260,7 @@ class ReverseLazyTest(TestCase):
self.assertEqual(response.status_code, 200)
class ReverseShortcutTests(TestCase):
- urls = 'regressiontests.urlpatterns_reverse.urls'
+ urls = 'urlpatterns_reverse.urls'
def test_redirect_to_object(self):
# We don't really need a model; just something with a get_absolute_url
@@ -299,7 +299,7 @@ class ReverseShortcutTests(TestCase):
class NamespaceTests(TestCase):
- urls = 'regressiontests.urlpatterns_reverse.namespace_urls'
+ urls = 'urlpatterns_reverse.namespace_urls'
def test_ambiguous_object(self):
"Names deployed via dynamic URL objects that require namespaces can't be resolved"
@@ -458,8 +458,8 @@ class ErrorHandlerResolutionTests(TestCase):
def setUp(self):
from django.core.urlresolvers import RegexURLResolver
- urlconf = 'regressiontests.urlpatterns_reverse.urls_error_handlers'
- urlconf_callables = 'regressiontests.urlpatterns_reverse.urls_error_handlers_callables'
+ urlconf = 'urlpatterns_reverse.urls_error_handlers'
+ urlconf_callables = 'urlpatterns_reverse.urls_error_handlers_callables'
self.resolver = RegexURLResolver(r'^$', urlconf)
self.callable_resolver = RegexURLResolver(r'^$', urlconf_callables)
@@ -476,7 +476,7 @@ class ErrorHandlerResolutionTests(TestCase):
self.assertEqual(self.callable_resolver.resolve500(), handler)
class DefaultErrorHandlerTests(TestCase):
- urls = 'regressiontests.urlpatterns_reverse.urls_without_full_import'
+ urls = 'urlpatterns_reverse.urls_without_full_import'
def test_default_handler(self):
"If the urls.py doesn't specify handlers, the defaults are used"
@@ -499,7 +499,7 @@ class NoRootUrlConfTests(TestCase):
self.assertRaises(ImproperlyConfigured, self.client.get, '/test/me/')
class ResolverMatchTests(TestCase):
- urls = 'regressiontests.urlpatterns_reverse.namespace_urls'
+ urls = 'urlpatterns_reverse.namespace_urls'
def test_urlpattern_resolve(self):
for path, name, app_name, namespace, func, args, kwargs in resolve_test_data:
@@ -530,7 +530,7 @@ class ResolverMatchTests(TestCase):
self.assertEqual(resolver_match.url_name, 'test-resolver-match')
class ErroneousViewTests(TestCase):
- urls = 'regressiontests.urlpatterns_reverse.erroneous_urls'
+ urls = 'urlpatterns_reverse.erroneous_urls'
def test_erroneous_resolve(self):
self.assertRaises(ImportError, self.client.get, '/erroneous_inner/')
@@ -554,9 +554,9 @@ class ViewLoadingTests(TestCase):
# ViewDoesNotExist, ...
six.assertRaisesRegex(self, ViewDoesNotExist, ".*View does not exist in.*",
get_callable,
- 'regressiontests.urlpatterns_reverse.views.i_should_not_exist')
+ 'urlpatterns_reverse.views.i_should_not_exist')
# ... but if the AttributeError is caused by something else don't
# swallow it.
self.assertRaises(AttributeError, get_callable,
- 'regressiontests.urlpatterns_reverse.views_broken.i_am_broken')
+ 'urlpatterns_reverse.views_broken.i_am_broken')
diff --git a/tests/urlpatterns_reverse/urls.py b/tests/urlpatterns_reverse/urls.py
index 1d4ae73c67..80752e54c6 100644
--- a/tests/urlpatterns_reverse/urls.py
+++ b/tests/urlpatterns_reverse/urls.py
@@ -49,8 +49,8 @@ urlpatterns = patterns('',
url(r'^test/1/?', empty_view, name="test"),
url(r'^(?i)test/2/?$', empty_view, name="test2"),
url(r'^outer/(?P<outer>\d+)/',
- include('regressiontests.urlpatterns_reverse.included_urls')),
- url('', include('regressiontests.urlpatterns_reverse.extra_urls')),
+ include('urlpatterns_reverse.included_urls')),
+ url('', include('urlpatterns_reverse.extra_urls')),
# This is non-reversible, but we shouldn't blow up when parsing it.
url(r'^(?:foo|bar)(\w+)/$', empty_view, name="disjunction"),
diff --git a/tests/urlpatterns_reverse/urls_error_handlers.py b/tests/urlpatterns_reverse/urls_error_handlers.py
index 7a3e22078e..be4f42afbc 100644
--- a/tests/urlpatterns_reverse/urls_error_handlers.py
+++ b/tests/urlpatterns_reverse/urls_error_handlers.py
@@ -4,5 +4,5 @@ from django.conf.urls import patterns
urlpatterns = patterns('')
-handler404 = 'regressiontests.urlpatterns_reverse.views.empty_view'
-handler500 = 'regressiontests.urlpatterns_reverse.views.empty_view'
+handler404 = 'urlpatterns_reverse.views.empty_view'
+handler500 = 'urlpatterns_reverse.views.empty_view'