From: Thomas Fillon Date: Wed, 25 Jan 2017 16:02:53 +0000 (+0100) Subject: Fix RemovedInDjango19Warning for RedirectView.permanent X-Git-Tag: 1.7.0~2^2~24^2~9 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2bcb6687570489cc6e9e8124b0d9d7fdcb3ce993;p=telemeta.git Fix RemovedInDjango19Warning for RedirectView.permanent RemovedInDjango19Warning: Default value of 'RedirectView.permanent' will change from True to False in Django 1.9. --- diff --git a/telemeta/urls.py b/telemeta/urls.py index 9ddf8259..759eebb0 100644 --- a/telemeta/urls.py +++ b/telemeta/urls.py @@ -55,7 +55,7 @@ export_extensions = "|".join(item_view.list_export_extensions()) urlpatterns = [ url(r'^$', home_view.home, name="telemeta-home"), - url(r'^test', TemplateView.as_view(template_name = "telemeta/hello_world.html")), + url(r'^test', TemplateView.as_view(template_name="telemeta/hello_world.html")), # items url(r'^archives/items/$', ItemListView.as_view(), name="telemeta-items"), @@ -85,10 +85,10 @@ urlpatterns = [ url(r'^archives/markers/(?P[A-Za-z0-9]+)/$', item_view.item_detail, name="telemeta-item-detail-marker"), # Redirections to old URLs - url(r'^items/(?P[A-Za-z0-9._-s/]+)/$', RedirectView.as_view(url='/archives/items/%(path)s/', permanent= True), name="telemeta-item-redir"), - url(r'^collections/(?P[A-Za-z0-9._-s/]+)/$', RedirectView.as_view(url='/archives/collections/%(path)s/', permanent= True), name="telemeta-collection-redir"), - url(r'^corpus/(?P[A-Za-z0-9._-s/]+)/$', RedirectView.as_view(url='/archives/corpus/%(path)s/', permanent= True), name="telemeta-corpus-redir"), - url(r'^fonds/(?P[A-Za-z0-9._-s/]+)/$', RedirectView.as_view(url='/archives/fonds/%(path)s/', permanent= True), name="telemeta-fonds-redir"), + url(r'^items/(?P[A-Za-z0-9._-s/]+)/$', RedirectView.as_view(url='/archives/items/%(path)s/', permanent=True), name="telemeta-item-redir"), + url(r'^collections/(?P[A-Za-z0-9._-s/]+)/$', RedirectView.as_view(url='/archives/collections/%(path)s/', permanent=True), name="telemeta-collection-redir"), + url(r'^corpus/(?P[A-Za-z0-9._-s/]+)/$', RedirectView.as_view(url='/archives/corpus/%(path)s/', permanent=True), name="telemeta-corpus-redir"), + url(r'^fonds/(?P[A-Za-z0-9._-s/]+)/$', RedirectView.as_view(url='/archives/fonds/%(path)s/', permanent=True), name="telemeta-fonds-redir"), # collections url(r'^archives/collections/$', CollectionListView.as_view(), name="telemeta-collections"), @@ -108,7 +108,7 @@ urlpatterns = [ url(r'^archives/collections/(?P[A-Za-z0-9._-]+)/related/(?P[A-Za-z0-9._-]+)/download/$', collection_view.related_media_collection_download, name="telemeta-collection-related-download"), # FIXME: need all paths - url(r'^collections/(?P[A-Za-z0-9._-s/]+)/$', RedirectView.as_view(), {'url': '/archives/collections/%(path)s/', 'permanent': False}, name="telemeta-collection-redir"), + url(r'^collections/(?P[A-Za-z0-9._-s/]+)/$', RedirectView.as_view(url='/archives/collections/%(path)s/', permanent=False), name="telemeta-collection-redir"), url(r'^archives/collections/(?P[A-Za-z0-9._-]+)/zip/$', CollectionZipView.as_view(), name="telemeta-collection-zip"), url(r'^archives/collections/(?P[A-Za-z0-9._-]+)/epub/$', CollectionEpubView.as_view(), name="telemeta-collection-epub"), @@ -136,7 +136,7 @@ urlpatterns = [ #url(r'^search/booleaninstru/$', boolean_view.get_boolean_query), url(r'^search/playlist_add/(?P[A-Za-z0-9._-]+)/$', NewPlaylistView().display, name='haystack_playlist'), - url(r'^search/playlist_confirmation/(?P[A-Za-z0-9._-]+)/$',NewPlaylistView().addToPlaylist, name='add_confirmation'), + url(r'^search/playlist_confirmation/(?P[A-Za-z0-9._-]+)/$', NewPlaylistView().addToPlaylist, name='add_confirmation'), url(r'^complete_location/$', home_view.complete_location, name="telemeta-complete-location"), @@ -147,14 +147,14 @@ urlpatterns = [ url(r'^admin/users/$', admin_view.admin_users, name="telemeta-admin-users"), # instruments administration - url(r'^admin/instruments/$', instrument_view.edit_instrument , name="telemeta-instrument-edit"), + url(r'^admin/instruments/$', instrument_view.edit_instrument, name="telemeta-instrument-edit"), url(r'^admin/instruments/add/$', instrument_view.add_to_instrument, name="telemeta-instrument-add"), url(r'^admin/instruments/update/$', instrument_view.update_instrument, name="telemeta-instrument-update"), url(r'^admin/instruments/' + r'(?P[0-9]+)/$', instrument_view.edit_instrument_value, name="telemeta-instrument-record-edit"), - url(r'^admin/instruments/' + r'(?P[0-9]+)/'+'list-items-published/$', ItemInstrumentPublishedListView.as_view(),name="telemeta-items-instrument-published"), - url(r'^admin/instruments/' + r'(?P[0-9]+)/'+'list-items-unpublished/$', ItemInstrumentUnpublishedListView.as_view(),name="telemeta-items-instrument-unpublished"), - url(r'^admin/instruments/' + r'(?P[0-9]+)/'+'list-items-sound/$', ItemInstrumentSoundListView.as_view(),name="telemeta-items-instrument-sound"), - url(r'^admin/instruments/' + r'(?P[0-9]+)/'+'list-items/$', ItemInstrumentListView.as_view(), name="telemeta-instrument-item-list"), + url(r'^admin/instruments/' + r'(?P[0-9]+)/' + 'list-items-published/$', ItemInstrumentPublishedListView.as_view(), name="telemeta-items-instrument-published"), + url(r'^admin/instruments/' + r'(?P[0-9]+)/' + 'list-items-unpublished/$', ItemInstrumentUnpublishedListView.as_view(), name="telemeta-items-instrument-unpublished"), + url(r'^admin/instruments/' + r'(?P[0-9]+)/' + 'list-items-sound/$', ItemInstrumentSoundListView.as_view(), name="telemeta-items-instrument-sound"), + url(r'^admin/instruments/' + r'(?P[0-9]+)/' + 'list-items/$', ItemInstrumentListView.as_view(), name="telemeta-instrument-item-list"), url(r'^admin/instruments/' + r'(?P[0-9]+)/update/$', instrument_view.update_instrument_value, name="telemeta-instrument-record-update"), url(r'^admin/instruments/' + r'(?P[0-9]+)/replace/$', instrument_view.replace_instrument_value, name="telemeta-instrument-record-replace"), @@ -165,13 +165,13 @@ urlpatterns = [ url(r'^admin/instrument_aliases/' + r'(?P[0-9]+)/$', instrument_alias_view.edit_instrument_value, name="telemeta-instrument-alias-record-edit"), url(r'^admin/instrument_aliases/' + r'(?P[0-9]+)/update/$', instrument_alias_view.update_instrument_value, name="telemeta-instrument-alias-record-update"), url(r'^admin/instrument_aliases/' + r'(?P[0-9]+)/replace/$', instrument_alias_view.replace_instrument_value, name="telemeta-instrument-alias-record-replace"), - url(r'^admin/instrument_aliases/' + r'(?P[0-9]+)/'+'list-item-published/$', ItemAliasPublishedListView.as_view(),name="telemeta-items-alias-published"), - url(r'^admin/instrument_aliases/' + r'(?P[0-9]+)/'+'list-item-unpublished/$', ItemAliasUnpublishedListView.as_view(),name="telemeta-items-alias-unpublished"), - url(r'^admin/instrument_aliases/' + r'(?P[0-9]+)/'+'list-item-sound/$', ItemAliasSoundListView.as_view(),name="telemeta-items-alias-sound"), - url(r'^admin/instrument_aliases/' + r'(?P[0-9]+)/'+'list-items/$', ItemAliasListView.as_view(), name="telemeta-alias-item-list"), + url(r'^admin/instrument_aliases/' + r'(?P[0-9]+)/' + 'list-item-published/$', ItemAliasPublishedListView.as_view(), name="telemeta-items-alias-published"), + url(r'^admin/instrument_aliases/' + r'(?P[0-9]+)/' + 'list-item-unpublished/$', ItemAliasUnpublishedListView.as_view(), name="telemeta-items-alias-unpublished"), + url(r'^admin/instrument_aliases/' + r'(?P[0-9]+)/' + 'list-item-sound/$', ItemAliasSoundListView.as_view(), name="telemeta-items-alias-sound"), + url(r'^admin/instrument_aliases/' + r'(?P[0-9]+)/' + 'list-items/$', ItemAliasListView.as_view(), name="telemeta-alias-item-list"), # enumerations administration - url(r'^admin/enumerations/(?P[0-9a-z]+)/$', admin_view.edit_enumeration , name="telemeta-enumeration-edit"), + url(r'^admin/enumerations/(?P[0-9a-z]+)/$', admin_view.edit_enumeration, name="telemeta-enumeration-edit"), url(r'^admin/enumerations/(?P[0-9a-z]+)/add/$', admin_view.add_to_enumeration, name="telemeta-enumeration-add"), url(r'^admin/enumerations/(?P[0-9a-z]+)/update/$', admin_view.update_enumeration, name="telemeta-enumeration-update"), url(r'^admin/enumerations/(?P[0-9a-z]+)/' + r'(?P[0-9]+)/$', admin_view.edit_enumeration_value, name="telemeta-enumeration-record-edit"), @@ -182,7 +182,7 @@ urlpatterns = [ url(r'^geo/$', geo_view.list_continents, name="telemeta-geo-continents"), url(r'^geo/(?P[a-z_]+)/$', geo_view.list_countries, name="telemeta-geo-countries"), url(r'^geo/collections/(?P[a-z_]+)/(?P[a-z_]+)/$', GeoCountryCollectionView.as_view(), name="telemeta-geo-country-collections"), - url(r'^geo/items/(?P[a-z_]+)/(?P[a-z_]+)/$', GeoCountryItemView.as_view() , name="telemeta-geo-country-items"), + url(r'^geo/items/(?P[a-z_]+)/(?P[a-z_]+)/$', GeoCountryItemView.as_view(), name="telemeta-geo-country-items"), url(r'^geo/country_info/(?P[0-9a-z]+)/$', geo_view.country_info, name="telemeta-country-info"), # Flat pages @@ -194,7 +194,7 @@ urlpatterns = [ # Authentication url(r'^login/$', auth_views.login, {'template_name': 'telemeta/login.html'}, name="telemeta-login"), url(r'^accounts/login/$', auth_views.login, {'template_name': 'telemeta/login.html'}, name="telemeta-login"), - #url(r'^login/$', 'ipauth.views.login', {'template_name': 'telemeta/login.html'}, + # url(r'^login/$', 'ipauth.views.login', {'template_name': 'telemeta/login.html'}, # name="telemeta-login"), url(r'^logout/$', home_view.logout, name="telemeta-logout"), @@ -210,7 +210,7 @@ urlpatterns = [ url(r'^accounts/(?P[A-Za-z0-9._-]+)/profile/$', profile_view.profile_detail, name="telemeta-profile-detail"), url(r'^users/(?P[A-Za-z0-9._-]+)/$', profile_view.profile_detail, name="telemeta-profile-detail-2"), url(r'^accounts/(?P[A-Za-z0-9._-]+)/profile/edit/$', profile_view.profile_edit, name="telemeta-profile-edit"), - url(r'^accounts/(?P[A-Za-z0-9._-]+)/rss/$', UserRevisionsFeed(), name="telemeta-user-rss"), + url(r'^accounts/(?P[A-Za-z0-9._-]+)/rss/$', UserRevisionsFeed(), name="telemeta-user-rss"), # Registration url(r'^accounts/password_change/$', auth_views.password_change, {'template_name': 'telemeta/registration/password_change_form.html'}, name="password_change"), @@ -232,7 +232,7 @@ urlpatterns = [ # Static media # FIXME:need to move export dir from the cache - url(r'^media/cache/(?P.*)$', serve, {'document_root': settings.TELEMETA_CACHE_DIR,}), + url(r'^media/cache/(?P.*)$', serve, {'document_root': settings.TELEMETA_CACHE_DIR, }), url(r'^', include('jqchat.urls')),