python/django-deploy
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

The root route (url '/' => pattern '^') should now be correct. #7

Merged
heinzel merged 1 commits from heinzel into master 2019-11-26 10:29:04 +01:00
Conversation 0 Commits 1 Files Changed 3 +3 -3
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ca4e65e926 - Show all commits

2
src/django_deploy/hooks.py
View File

@@ -24,7 +24,7 @@ def get_urlpatterns(file_path, urlpatterns):
if 'MOUNT' in config[app]: if 'MOUNT' in config[app]:
route, urlconf_module = config[app]['MOUNT'] route, urlconf_module = config[app]['MOUNT']
if route == '/': if route == '/':
pattern = '^$' pattern = '^'
else: else:
pattern = '^{}'.format(route) pattern = '^{}'.format(route)
url_obj = url(pattern, include(urlconf_module)) url_obj = url(pattern, include(urlconf_module))

2
src/django_deploy/tests/test_api.py
View File

@@ -174,7 +174,7 @@ class DjangoProjectTestCase(DjangoDeployTestCase):
project.mount_app('django_deploy.tests.fake_app1', '') project.mount_app('django_deploy.tests.fake_app1', '')
expected_urlpatterns = [ expected_urlpatterns = [
('URLResolver', '^$', 'django_deploy.tests.fake_app1.urls'), ('URLResolver', '^', 'django_deploy.tests.fake_app1.urls'),
] ]
self.assert_urlpatterns(project_dir, expected_urlpatterns) self.assert_urlpatterns(project_dir, expected_urlpatterns)

2
src/django_deploy/tests/test_program.py
View File

@@ -148,7 +148,7 @@ class ProgramTestCase(DjangoDeployTestCase):
# Similar code from test_api.test_mount_apps # Similar code from test_api.test_mount_apps
expected_urlpatterns = [ expected_urlpatterns = [
('URLResolver', '^$', 'django_deploy.tests.fake_app1.urls'), ('URLResolver', '^', 'django_deploy.tests.fake_app1.urls'),
('URLResolver', '^app2/', 'django_deploy.tests.fake_app2.urls'), ('URLResolver', '^app2/', 'django_deploy.tests.fake_app2.urls'),
] ]