diff options
Diffstat (limited to 'parts/django/tests/regressiontests/urlpatterns_reverse')
16 files changed, 0 insertions, 538 deletions
diff --git a/parts/django/tests/regressiontests/urlpatterns_reverse/__init__.py b/parts/django/tests/regressiontests/urlpatterns_reverse/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/parts/django/tests/regressiontests/urlpatterns_reverse/__init__.py +++ /dev/null diff --git a/parts/django/tests/regressiontests/urlpatterns_reverse/extra_urls.py b/parts/django/tests/regressiontests/urlpatterns_reverse/extra_urls.py deleted file mode 100644 index c171f6d..0000000 --- a/parts/django/tests/regressiontests/urlpatterns_reverse/extra_urls.py +++ /dev/null @@ -1,13 +0,0 @@ -""" -Some extra URL patterns that are included at the top level. -""" - -from django.conf.urls.defaults import * -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')), -) diff --git a/parts/django/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py b/parts/django/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py deleted file mode 100644 index 0731906..0000000 --- a/parts/django/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py +++ /dev/null @@ -1,13 +0,0 @@ -from django.conf.urls.defaults import * -from namespace_urls import URLObject - -testobj3 = URLObject('testapp', 'test-ns3') - -urlpatterns = patterns('regressiontests.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'), - - (r'^test3/', include(testobj3.urls)), - (r'^ns-included3/', include('regressiontests.urlpatterns_reverse.included_urls', namespace='inc-ns3')), -) - diff --git a/parts/django/tests/regressiontests/urlpatterns_reverse/included_urls.py b/parts/django/tests/regressiontests/urlpatterns_reverse/included_urls.py deleted file mode 100644 index f8acf34..0000000 --- a/parts/django/tests/regressiontests/urlpatterns_reverse/included_urls.py +++ /dev/null @@ -1,8 +0,0 @@ -from django.conf.urls.defaults import * -from views import empty_view - -urlpatterns = patterns('', - url(r'^$', empty_view, name="inner-nothing"), - url(r'^extra/(?P<extra>\w+)/$', empty_view, name="inner-extra"), - url(r'^(?P<one>\d+)|(?P<two>\d+)/$', empty_view, name="inner-disjunction"), -) diff --git a/parts/django/tests/regressiontests/urlpatterns_reverse/included_urls2.py b/parts/django/tests/regressiontests/urlpatterns_reverse/included_urls2.py deleted file mode 100644 index f414ca6..0000000 --- a/parts/django/tests/regressiontests/urlpatterns_reverse/included_urls2.py +++ /dev/null @@ -1,14 +0,0 @@ -""" -These URL patterns are included in two different ways in the main urls.py, with -an extra argument present in one case. Thus, there are two different ways for -each name to resolve and Django must distinguish the possibilities based on the -argument list. -""" - -from django.conf.urls.defaults import * -from views import empty_view - -urlpatterns = patterns('', - url(r'^part/(?P<value>\w+)/$', empty_view, name="part"), - url(r'^part2/(?:(?P<value>\w+)/)?$', empty_view, name="part2"), -) diff --git a/parts/django/tests/regressiontests/urlpatterns_reverse/middleware.py b/parts/django/tests/regressiontests/urlpatterns_reverse/middleware.py deleted file mode 100644 index cd3c045..0000000 --- a/parts/django/tests/regressiontests/urlpatterns_reverse/middleware.py +++ /dev/null @@ -1,11 +0,0 @@ -from django.core.urlresolvers import set_urlconf - -import urlconf_inner - -class ChangeURLconfMiddleware(object): - def process_request(self, request): - request.urlconf = urlconf_inner.__name__ - -class NullChangeURLconfMiddleware(object): - def process_request(self, request): - request.urlconf = None diff --git a/parts/django/tests/regressiontests/urlpatterns_reverse/models.py b/parts/django/tests/regressiontests/urlpatterns_reverse/models.py deleted file mode 100644 index e69de29..0000000 --- a/parts/django/tests/regressiontests/urlpatterns_reverse/models.py +++ /dev/null diff --git a/parts/django/tests/regressiontests/urlpatterns_reverse/namespace_urls.py b/parts/django/tests/regressiontests/urlpatterns_reverse/namespace_urls.py deleted file mode 100644 index 27cc7f7..0000000 --- a/parts/django/tests/regressiontests/urlpatterns_reverse/namespace_urls.py +++ /dev/null @@ -1,38 +0,0 @@ -from django.conf.urls.defaults import * - -class URLObject(object): - def __init__(self, app_name, namespace): - self.app_name = app_name - self.namespace = namespace - - def urls(self): - return patterns('', - url(r'^inner/$', 'empty_view', name='urlobject-view'), - url(r'^inner/(?P<arg1>\d+)/(?P<arg2>\d+)/$', 'empty_view', name='urlobject-view'), - ), self.app_name, self.namespace - urls = property(urls) - -testobj1 = URLObject('testapp', 'test-ns1') -testobj2 = URLObject('testapp', 'test-ns2') -default_testobj = URLObject('testapp', 'testapp') - -otherobj1 = URLObject('nodefault', 'other-ns1') -otherobj2 = URLObject('nodefault', 'other-ns2') - -urlpatterns = patterns('regressiontests.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'), - - (r'^test1/', include(testobj1.urls)), - (r'^test2/', include(testobj2.urls)), - (r'^default/', include(default_testobj.urls)), - - (r'^other1/', include(otherobj1.urls)), - (r'^other2/', include(otherobj2.urls)), - - (r'^ns-included1/', include('regressiontests.urlpatterns_reverse.included_namespace_urls', namespace='inc-ns1')), - (r'^ns-included2/', include('regressiontests.urlpatterns_reverse.included_namespace_urls', namespace='inc-ns2')), - - (r'^included/', include('regressiontests.urlpatterns_reverse.included_namespace_urls')), - -) diff --git a/parts/django/tests/regressiontests/urlpatterns_reverse/no_urls.py b/parts/django/tests/regressiontests/urlpatterns_reverse/no_urls.py deleted file mode 100644 index c9b9efe..0000000 --- a/parts/django/tests/regressiontests/urlpatterns_reverse/no_urls.py +++ /dev/null @@ -1,2 +0,0 @@ -#from django.conf.urls.defaults import * - diff --git a/parts/django/tests/regressiontests/urlpatterns_reverse/tests.py b/parts/django/tests/regressiontests/urlpatterns_reverse/tests.py deleted file mode 100644 index d0b7146..0000000 --- a/parts/django/tests/regressiontests/urlpatterns_reverse/tests.py +++ /dev/null @@ -1,330 +0,0 @@ -""" -Unit tests for reverse URL lookups. -""" -import unittest - -from django.conf import settings -from django.core.exceptions import ImproperlyConfigured -from django.core.urlresolvers import reverse, resolve, NoReverseMatch, Resolver404, RegexURLResolver -from django.http import HttpResponseRedirect, HttpResponsePermanentRedirect -from django.shortcuts import redirect -from django.test import TestCase - -import urlconf_outer -import urlconf_inner -import middleware - -test_data = ( - ('places', '/places/3/', [3], {}), - ('places', '/places/3/', ['3'], {}), - ('places', NoReverseMatch, ['a'], {}), - ('places', NoReverseMatch, [], {}), - ('places?', '/place/', [], {}), - ('places+', '/places/', [], {}), - ('places*', '/place/', [], {}), - ('places2?', '/', [], {}), - ('places2+', '/places/', [], {}), - ('places2*', '/', [], {}), - ('places3', '/places/4/', [4], {}), - ('places3', '/places/harlem/', ['harlem'], {}), - ('places3', NoReverseMatch, ['harlem64'], {}), - ('places4', '/places/3/', [], {'id': 3}), - ('people', NoReverseMatch, [], {}), - ('people', '/people/adrian/', ['adrian'], {}), - ('people', '/people/adrian/', [], {'name': 'adrian'}), - ('people', NoReverseMatch, ['name with spaces'], {}), - ('people', NoReverseMatch, [], {'name': 'name with spaces'}), - ('people2', '/people/name/', [], {}), - ('people2a', '/people/name/fred/', ['fred'], {}), - ('optional', '/optional/fred/', [], {'name': 'fred'}), - ('optional', '/optional/fred/', ['fred'], {}), - ('hardcoded', '/hardcoded/', [], {}), - ('hardcoded2', '/hardcoded/doc.pdf', [], {}), - ('people3', '/people/il/adrian/', [], {'state': 'il', 'name': 'adrian'}), - ('people3', NoReverseMatch, [], {'state': 'il'}), - ('people3', NoReverseMatch, [], {'name': 'adrian'}), - ('people4', NoReverseMatch, [], {'state': 'il', 'name': 'adrian'}), - ('people6', '/people/il/test/adrian/', ['il/test', 'adrian'], {}), - ('people6', '/people//adrian/', ['adrian'], {}), - ('range', '/character_set/a/', [], {}), - ('range2', '/character_set/x/', [], {}), - ('price', '/price/$10/', ['10'], {}), - ('price2', '/price/$10/', ['10'], {}), - ('price3', '/price/$10/', ['10'], {}), - ('product', '/product/chocolate+($2.00)/', [], {'price': '2.00', 'product': 'chocolate'}), - ('headlines', '/headlines/2007.5.21/', [], dict(year=2007, month=5, day=21)), - ('windows', r'/windows_path/C:%5CDocuments%20and%20Settings%5Cspam/', [], dict(drive_name='C', path=r'Documents and Settings\spam')), - ('special', r'/special_chars/+%5C$*/', [r'+\$*'], {}), - ('special', NoReverseMatch, [''], {}), - ('mixed', '/john/0/', [], {'name': 'john'}), - ('repeats', '/repeats/a/', [], {}), - ('repeats2', '/repeats/aa/', [], {}), - ('repeats3', '/repeats/aa/', [], {}), - ('insensitive', '/CaseInsensitive/fred', ['fred'], {}), - ('test', '/test/1', [], {}), - ('test2', '/test/2', [], {}), - ('inner-nothing', '/outer/42/', [], {'outer': '42'}), - ('inner-nothing', '/outer/42/', ['42'], {}), - ('inner-nothing', NoReverseMatch, ['foo'], {}), - ('inner-extra', '/outer/42/extra/inner/', [], {'extra': 'inner', 'outer': '42'}), - ('inner-extra', '/outer/42/extra/inner/', ['42', 'inner'], {}), - ('inner-extra', NoReverseMatch, ['fred', 'inner'], {}), - ('disjunction', NoReverseMatch, ['foo'], {}), - ('inner-disjunction', NoReverseMatch, ['10', '11'], {}), - ('extra-places', '/e-places/10/', ['10'], {}), - ('extra-people', '/e-people/fred/', ['fred'], {}), - ('extra-people', '/e-people/fred/', [], {'name': 'fred'}), - ('part', '/part/one/', [], {'value': 'one'}), - ('part', '/prefix/xx/part/one/', [], {'value': 'one', 'prefix': 'xx'}), - ('part2', '/part2/one/', [], {'value': 'one'}), - ('part2', '/part2/', [], {}), - ('part2', '/prefix/xx/part2/one/', [], {'value': 'one', 'prefix': 'xx'}), - ('part2', '/prefix/xx/part2/', [], {'prefix': 'xx'}), - - # Regression for #9038 - # These views are resolved by method name. Each method is deployed twice - - # once with an explicit argument, and once using the default value on - # the method. This is potentially ambiguous, as you have to pick the - # 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}), - ('non_path_include', '/includes/non_path_include/', [], {}) - -) - -class NoURLPatternsTests(TestCase): - urls = 'regressiontests.urlpatterns_reverse.no_urls' - - def assertRaisesErrorWithMessage(self, error, message, callable, - *args, **kwargs): - self.assertRaises(error, callable, *args, **kwargs) - try: - callable(*args, **kwargs) - except error, e: - self.assertEqual(message, str(e)) - - def test_no_urls_exception(self): - """ - RegexURLResolver should raise an exception when no urlpatterns exist. - """ - resolver = RegexURLResolver(r'^$', self.urls) - - self.assertRaisesErrorWithMessage(ImproperlyConfigured, - "The included urlconf regressiontests.urlpatterns_reverse.no_urls "\ - "doesn't have any patterns in it", getattr, resolver, 'url_patterns') - -class URLPatternReverse(TestCase): - urls = 'regressiontests.urlpatterns_reverse.urls' - - def test_urlpattern_reverse(self): - for name, expected, args, kwargs in test_data: - try: - got = reverse(name, args=args, kwargs=kwargs) - except NoReverseMatch, e: - self.assertEqual(expected, NoReverseMatch) - else: - self.assertEquals(got, expected) - - def test_reverse_none(self): - # Reversing None should raise an error, not return the last un-named view. - self.assertRaises(NoReverseMatch, reverse, None) - -class ResolverTests(unittest.TestCase): - def test_non_regex(self): - """ - Verifies that we raise a Resolver404 if what we are resolving doesn't - meet the basic requirements of a path to match - i.e., at the very - least, it matches the root pattern '^/'. We must never return None - from resolve, or we will get a TypeError further down the line. - - Regression for #10834. - """ - self.assertRaises(Resolver404, resolve, '') - self.assertRaises(Resolver404, resolve, 'a') - self.assertRaises(Resolver404, resolve, '\\') - self.assertRaises(Resolver404, resolve, '.') - -class ReverseShortcutTests(TestCase): - urls = 'regressiontests.urlpatterns_reverse.urls' - - def test_redirect_to_object(self): - # We don't really need a model; just something with a get_absolute_url - class FakeObj(object): - def get_absolute_url(self): - return "/hi-there/" - - res = redirect(FakeObj()) - self.assert_(isinstance(res, HttpResponseRedirect)) - self.assertEqual(res['Location'], '/hi-there/') - - res = redirect(FakeObj(), permanent=True) - self.assert_(isinstance(res, HttpResponsePermanentRedirect)) - self.assertEqual(res['Location'], '/hi-there/') - - def test_redirect_to_view_name(self): - res = redirect('hardcoded2') - self.assertEqual(res['Location'], '/hardcoded/doc.pdf') - res = redirect('places', 1) - self.assertEqual(res['Location'], '/places/1/') - res = redirect('headlines', year='2008', month='02', day='17') - self.assertEqual(res['Location'], '/headlines/2008.02.17/') - self.assertRaises(NoReverseMatch, redirect, 'not-a-view') - - def test_redirect_to_url(self): - res = redirect('/foo/') - self.assertEqual(res['Location'], '/foo/') - res = redirect('http://example.com/') - self.assertEqual(res['Location'], 'http://example.com/') - - def test_redirect_view_object(self): - from views import absolute_kwargs_view - res = redirect(absolute_kwargs_view) - self.assertEqual(res['Location'], '/absolute_arg_view/') - self.assertRaises(NoReverseMatch, redirect, absolute_kwargs_view, wrong_argument=None) - - -class NamespaceTests(TestCase): - urls = 'regressiontests.urlpatterns_reverse.namespace_urls' - - def test_ambiguous_object(self): - "Names deployed via dynamic URL objects that require namespaces can't be resolved" - self.assertRaises(NoReverseMatch, reverse, 'urlobject-view') - self.assertRaises(NoReverseMatch, reverse, 'urlobject-view', args=[37,42]) - self.assertRaises(NoReverseMatch, reverse, 'urlobject-view', kwargs={'arg1':42, 'arg2':37}) - - def test_ambiguous_urlpattern(self): - "Names deployed via dynamic URL objects that require namespaces can't be resolved" - self.assertRaises(NoReverseMatch, reverse, 'inner-nothing') - self.assertRaises(NoReverseMatch, reverse, 'inner-nothing', args=[37,42]) - self.assertRaises(NoReverseMatch, reverse, 'inner-nothing', kwargs={'arg1':42, 'arg2':37}) - - def test_non_existent_namespace(self): - "Non-existent namespaces raise errors" - self.assertRaises(NoReverseMatch, reverse, 'blahblah:urlobject-view') - self.assertRaises(NoReverseMatch, reverse, 'test-ns1:blahblah:urlobject-view') - - def test_normal_name(self): - "Normal lookups work as expected" - self.assertEquals('/normal/', reverse('normal-view')) - self.assertEquals('/normal/37/42/', reverse('normal-view', args=[37,42])) - self.assertEquals('/normal/42/37/', reverse('normal-view', kwargs={'arg1':42, 'arg2':37})) - - def test_simple_included_name(self): - "Normal lookups work on names included from other patterns" - self.assertEquals('/included/normal/', reverse('inc-normal-view')) - self.assertEquals('/included/normal/37/42/', reverse('inc-normal-view', args=[37,42])) - self.assertEquals('/included/normal/42/37/', reverse('inc-normal-view', kwargs={'arg1':42, 'arg2':37})) - - def test_namespace_object(self): - "Dynamic URL objects can be found using a namespace" - self.assertEquals('/test1/inner/', reverse('test-ns1:urlobject-view')) - self.assertEquals('/test1/inner/37/42/', reverse('test-ns1:urlobject-view', args=[37,42])) - self.assertEquals('/test1/inner/42/37/', reverse('test-ns1:urlobject-view', kwargs={'arg1':42, 'arg2':37})) - - def test_embedded_namespace_object(self): - "Namespaces can be installed anywhere in the URL pattern tree" - self.assertEquals('/included/test3/inner/', reverse('test-ns3:urlobject-view')) - self.assertEquals('/included/test3/inner/37/42/', reverse('test-ns3:urlobject-view', args=[37,42])) - self.assertEquals('/included/test3/inner/42/37/', reverse('test-ns3:urlobject-view', kwargs={'arg1':42, 'arg2':37})) - - def test_namespace_pattern(self): - "Namespaces can be applied to include()'d urlpatterns" - self.assertEquals('/ns-included1/normal/', reverse('inc-ns1:inc-normal-view')) - self.assertEquals('/ns-included1/normal/37/42/', reverse('inc-ns1:inc-normal-view', args=[37,42])) - self.assertEquals('/ns-included1/normal/42/37/', reverse('inc-ns1:inc-normal-view', kwargs={'arg1':42, 'arg2':37})) - - def test_multiple_namespace_pattern(self): - "Namespaces can be embedded" - self.assertEquals('/ns-included1/test3/inner/', reverse('inc-ns1:test-ns3:urlobject-view')) - self.assertEquals('/ns-included1/test3/inner/37/42/', reverse('inc-ns1:test-ns3:urlobject-view', args=[37,42])) - self.assertEquals('/ns-included1/test3/inner/42/37/', reverse('inc-ns1:test-ns3:urlobject-view', kwargs={'arg1':42, 'arg2':37})) - - def test_app_lookup_object(self): - "A default application namespace can be used for lookup" - self.assertEquals('/default/inner/', reverse('testapp:urlobject-view')) - self.assertEquals('/default/inner/37/42/', reverse('testapp:urlobject-view', args=[37,42])) - self.assertEquals('/default/inner/42/37/', reverse('testapp:urlobject-view', kwargs={'arg1':42, 'arg2':37})) - - def test_app_lookup_object_with_default(self): - "A default application namespace is sensitive to the 'current' app can be used for lookup" - self.assertEquals('/included/test3/inner/', reverse('testapp:urlobject-view', current_app='test-ns3')) - self.assertEquals('/included/test3/inner/37/42/', reverse('testapp:urlobject-view', args=[37,42], current_app='test-ns3')) - self.assertEquals('/included/test3/inner/42/37/', reverse('testapp:urlobject-view', kwargs={'arg1':42, 'arg2':37}, current_app='test-ns3')) - - def test_app_lookup_object_without_default(self): - "An application namespace without a default is sensitive to the 'current' app can be used for lookup" - self.assertEquals('/other2/inner/', reverse('nodefault:urlobject-view')) - self.assertEquals('/other2/inner/37/42/', reverse('nodefault:urlobject-view', args=[37,42])) - self.assertEquals('/other2/inner/42/37/', reverse('nodefault:urlobject-view', kwargs={'arg1':42, 'arg2':37})) - - self.assertEquals('/other1/inner/', reverse('nodefault:urlobject-view', current_app='other-ns1')) - self.assertEquals('/other1/inner/37/42/', reverse('nodefault:urlobject-view', args=[37,42], current_app='other-ns1')) - self.assertEquals('/other1/inner/42/37/', reverse('nodefault:urlobject-view', kwargs={'arg1':42, 'arg2':37}, current_app='other-ns1')) - -class RequestURLconfTests(TestCase): - def setUp(self): - self.root_urlconf = settings.ROOT_URLCONF - self.middleware_classes = settings.MIDDLEWARE_CLASSES - settings.ROOT_URLCONF = urlconf_outer.__name__ - - def tearDown(self): - settings.ROOT_URLCONF = self.root_urlconf - settings.MIDDLEWARE_CLASSES = self.middleware_classes - - def test_urlconf(self): - response = self.client.get('/test/me/') - self.assertEqual(response.status_code, 200) - self.assertEqual(response.content, 'outer:/test/me/,' - 'inner:/inner_urlconf/second_test/') - response = self.client.get('/inner_urlconf/second_test/') - self.assertEqual(response.status_code, 200) - response = self.client.get('/second_test/') - self.assertEqual(response.status_code, 404) - - def test_urlconf_overridden(self): - settings.MIDDLEWARE_CLASSES += ( - '%s.ChangeURLconfMiddleware' % middleware.__name__, - ) - response = self.client.get('/test/me/') - self.assertEqual(response.status_code, 404) - response = self.client.get('/inner_urlconf/second_test/') - self.assertEqual(response.status_code, 404) - response = self.client.get('/second_test/') - self.assertEqual(response.status_code, 200) - self.assertEqual(response.content, 'outer:,inner:/second_test/') - - def test_urlconf_overridden_with_null(self): - settings.MIDDLEWARE_CLASSES += ( - '%s.NullChangeURLconfMiddleware' % middleware.__name__, - ) - self.assertRaises(ImproperlyConfigured, self.client.get, '/test/me/') - -class ErrorHandlerResolutionTests(TestCase): - """Tests for handler404 and handler500""" - - def setUp(self): - urlconf = 'regressiontests.urlpatterns_reverse.urls_error_handlers' - urlconf_callables = 'regressiontests.urlpatterns_reverse.urls_error_handlers_callables' - self.resolver = RegexURLResolver(r'^$', urlconf) - self.callable_resolver = RegexURLResolver(r'^$', urlconf_callables) - - def test_named_handlers(self): - from views import empty_view - handler = (empty_view, {}) - self.assertEqual(self.resolver.resolve404(), handler) - self.assertEqual(self.resolver.resolve500(), handler) - - def test_callable_handers(self): - from views import empty_view - handler = (empty_view, {}) - self.assertEqual(self.callable_resolver.resolve404(), handler) - self.assertEqual(self.callable_resolver.resolve500(), handler) - -class NoRootUrlConfTests(TestCase): - """Tests for handler404 and handler500 if urlconf is None""" - urls = None - - def test_no_handler_exception(self): - self.assertRaises(ImproperlyConfigured, self.client.get, '/test/me/') diff --git a/parts/django/tests/regressiontests/urlpatterns_reverse/urlconf_inner.py b/parts/django/tests/regressiontests/urlpatterns_reverse/urlconf_inner.py deleted file mode 100644 index d188e06..0000000 --- a/parts/django/tests/regressiontests/urlpatterns_reverse/urlconf_inner.py +++ /dev/null @@ -1,12 +0,0 @@ -from django.conf.urls.defaults import * -from django.template import Template, Context -from django.http import HttpResponse - -def inner_view(request): - content = Template('{% url outer as outer_url %}outer:{{ outer_url }},' - '{% url inner as inner_url %}inner:{{ inner_url }}').render(Context()) - return HttpResponse(content) - -urlpatterns = patterns('', - url(r'^second_test/$', inner_view, name='inner'), -)
\ No newline at end of file diff --git a/parts/django/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py b/parts/django/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py deleted file mode 100644 index 506e036..0000000 --- a/parts/django/tests/regressiontests/urlpatterns_reverse/urlconf_outer.py +++ /dev/null @@ -1,9 +0,0 @@ -from django.conf.urls.defaults import * - -import urlconf_inner - - -urlpatterns = patterns('', - url(r'^test/me/$', urlconf_inner.inner_view, name='outer'), - url(r'^inner_urlconf/', include(urlconf_inner.__name__)) -)
\ No newline at end of file diff --git a/parts/django/tests/regressiontests/urlpatterns_reverse/urls.py b/parts/django/tests/regressiontests/urlpatterns_reverse/urls.py deleted file mode 100644 index c603c02..0000000 --- a/parts/django/tests/regressiontests/urlpatterns_reverse/urls.py +++ /dev/null @@ -1,63 +0,0 @@ -from django.conf.urls.defaults import * -from views import empty_view, absolute_kwargs_view - -other_patterns = patterns('', - url(r'non_path_include/$', empty_view, name='non_path_include'), -) - -urlpatterns = patterns('', - url(r'^places/(\d+)/$', empty_view, name='places'), - url(r'^places?/$', empty_view, name="places?"), - url(r'^places+/$', empty_view, name="places+"), - url(r'^places*/$', empty_view, name="places*"), - url(r'^(?:places/)?$', empty_view, name="places2?"), - url(r'^(?:places/)+$', empty_view, name="places2+"), - url(r'^(?:places/)*$', empty_view, name="places2*"), - url(r'^places/(\d+|[a-z_]+)/', empty_view, name="places3"), - url(r'^places/(?P<id>\d+)/$', empty_view, name="places4"), - url(r'^people/(?P<name>\w+)/$', empty_view, name="people"), - url(r'^people/(?:name/)', empty_view, name="people2"), - url(r'^people/(?:name/(\w+)/)?', empty_view, name="people2a"), - url(r'^optional/(?P<name>.*)/(?:.+/)?', empty_view, name="optional"), - url(r'^hardcoded/$', 'hardcoded/', empty_view, name="hardcoded"), - url(r'^hardcoded/doc\.pdf$', empty_view, name="hardcoded2"), - url(r'^people/(?P<state>\w\w)/(?P<name>\w+)/$', empty_view, name="people3"), - url(r'^people/(?P<state>\w\w)/(?P<name>\d)/$', empty_view, name="people4"), - url(r'^people/((?P<state>\w\w)/test)?/(\w+)/$', empty_view, name="people6"), - url(r'^character_set/[abcdef0-9]/$', empty_view, name="range"), - url(r'^character_set/[\w]/$', empty_view, name="range2"), - url(r'^price/\$(\d+)/$', empty_view, name="price"), - url(r'^price/[$](\d+)/$', empty_view, name="price2"), - url(r'^price/[\$](\d+)/$', empty_view, name="price3"), - url(r'^product/(?P<product>\w+)\+\(\$(?P<price>\d+(\.\d+)?)\)/$', - empty_view, name="product"), - url(r'^headlines/(?P<year>\d+)\.(?P<month>\d+)\.(?P<day>\d+)/$', empty_view, - name="headlines"), - url(r'^windows_path/(?P<drive_name>[A-Z]):\\(?P<path>.+)/$', empty_view, - name="windows"), - url(r'^special_chars/(.+)/$', empty_view, name="special"), - url(r'^(?P<name>.+)/\d+/$', empty_view, name="mixed"), - url(r'^repeats/a{1,2}/$', empty_view, name="repeats"), - url(r'^repeats/a{2,4}/$', empty_view, name="repeats2"), - url(r'^repeats/a{2}/$', empty_view, name="repeats3"), - url(r'^(?i)CaseInsensitive/(\w+)', empty_view, name="insensitive"), - 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')), - - # This is non-reversible, but we shouldn't blow up when parsing it. - 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<arg1>\d+)/$', 'kwargs_view'), - url(r'absolute_arg_view/(?P<arg1>\d+)/$', absolute_kwargs_view), - url(r'absolute_arg_view/$', absolute_kwargs_view), - - url('^includes/', include(other_patterns)), - -) - - diff --git a/parts/django/tests/regressiontests/urlpatterns_reverse/urls_error_handlers.py b/parts/django/tests/regressiontests/urlpatterns_reverse/urls_error_handlers.py deleted file mode 100644 index c2e0d32..0000000 --- a/parts/django/tests/regressiontests/urlpatterns_reverse/urls_error_handlers.py +++ /dev/null @@ -1,8 +0,0 @@ -# Used by the ErrorHandlerResolutionTests test case. - -from django.conf.urls.defaults import patterns - -urlpatterns = patterns('') - -handler404 = 'regressiontests.urlpatterns_reverse.views.empty_view' -handler500 = 'regressiontests.urlpatterns_reverse.views.empty_view' diff --git a/parts/django/tests/regressiontests/urlpatterns_reverse/urls_error_handlers_callables.py b/parts/django/tests/regressiontests/urlpatterns_reverse/urls_error_handlers_callables.py deleted file mode 100644 index 00f25a7..0000000 --- a/parts/django/tests/regressiontests/urlpatterns_reverse/urls_error_handlers_callables.py +++ /dev/null @@ -1,9 +0,0 @@ -# Used by the ErrorHandlerResolutionTests test case. - -from django.conf.urls.defaults import patterns -from views import empty_view - -urlpatterns = patterns('') - -handler404 = empty_view -handler500 = empty_view diff --git a/parts/django/tests/regressiontests/urlpatterns_reverse/views.py b/parts/django/tests/regressiontests/urlpatterns_reverse/views.py deleted file mode 100644 index 99c00bd..0000000 --- a/parts/django/tests/regressiontests/urlpatterns_reverse/views.py +++ /dev/null @@ -1,8 +0,0 @@ -def empty_view(request, *args, **kwargs): - pass - -def kwargs_view(request, arg1=1, arg2=2): - pass - -def absolute_kwargs_view(request, arg1=1, arg2=2): - pass |