MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-19 20:59:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

urls*: Use new urlpatterns list syntax

Browse Source 
The patterns() function is deprecated in Django 1.8 and gone in 1.10, so
we should switch over to the new list format.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2018-04-12 15:57:45 +12:00
parent a918098981
commit 5cf6ef57b7
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
layerindex/urls.py
View File

@ -27,7 +27,7 @@ router.register(r'distros', restviews.DistroViewSet)
router.register(r'classes', restviews.ClassViewSet) router.register(r'classes', restviews.ClassViewSet)
router.register(r'layers', restviews.LayerViewSet, 'layers') router.register(r'layers', restviews.LayerViewSet, 'layers')
urlpatterns = patterns('', urlpatterns = [
url(r'^$', url(r'^$',
RedirectView.as_view(url=reverse_lazy('layer_list', args=('master',)), permanent=False), RedirectView.as_view(url=reverse_lazy('layer_list', args=('master',)), permanent=False),
name='frontpage'), name='frontpage'),
@ -147,4 +147,4 @@ urlpatterns = patterns('',
template_name='layerindex/classicrecipedetail.html'), template_name='layerindex/classicrecipedetail.html'),
name='classic_recipe'), name='classic_recipe'),
url(r'.*', page_not_found) url(r'.*', page_not_found)
) ]

4
layerindex/urls_branch.py
View File

@ -9,7 +9,7 @@ from django.views.defaults import page_not_found
from django.core.urlresolvers import reverse_lazy from django.core.urlresolvers import reverse_lazy
from layerindex.views import LayerListView, RecipeSearchView, MachineSearchView, DistroSearchView, ClassSearchView, PlainTextListView, LayerDetailView, edit_layer_view, delete_layer_view, edit_layernote_view, delete_layernote_view, RedirectParamsView, DuplicatesView, LayerUpdateDetailView from layerindex.views import LayerListView, RecipeSearchView, MachineSearchView, DistroSearchView, ClassSearchView, PlainTextListView, LayerDetailView, edit_layer_view, delete_layer_view, edit_layernote_view, delete_layernote_view, RedirectParamsView, DuplicatesView, LayerUpdateDetailView
urlpatterns = patterns('', urlpatterns = [
url(r'^$', url(r'^$',
RedirectParamsView.as_view(permanent=False), {'redirect_name': 'layer_list'}), RedirectParamsView.as_view(permanent=False), {'redirect_name': 'layer_list'}),
url(r'^layers/$', url(r'^layers/$',
@ -41,4 +41,4 @@ urlpatterns = patterns('',
DuplicatesView.as_view( DuplicatesView.as_view(
template_name='layerindex/duplicates.html'), template_name='layerindex/duplicates.html'),
name='duplicates'), name='duplicates'),
) ]

7
urls.py
View File

@ -5,17 +5,16 @@
# Copyright (c) Django Software Foundation and individual contributors. # Copyright (c) Django Software Foundation and individual contributors.
# All rights reserved. # All rights reserved.
from django.conf.urls import patterns, include, url from django.conf.urls import include, url
from django.views.generic import RedirectView from django.views.generic import RedirectView
from django.contrib import admin from django.contrib import admin
admin.autodiscover() admin.autodiscover()
urlpatterns = patterns('', urlpatterns = [
url(r'^layerindex/', include('layerindex.urls')), url(r'^layerindex/', include('layerindex.urls')),
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),
url(r'^accounts/', include('registration.backends.default.urls')), url(r'^accounts/', include('registration.backends.default.urls')),
url(r'^captcha/', include('captcha.urls')), url(r'^captcha/', include('captcha.urls')),
url(r'.*', RedirectView.as_view(url='/layerindex/', permanent=False)), url(r'.*', RedirectView.as_view(url='/layerindex/', permanent=False)),
) ]