From: Thomas Fillon Date: Wed, 25 Jan 2017 12:00:40 +0000 (+0100) Subject: Fix some deprecation warnings X-Git-Tag: 1.7.0~2^2~24^2~14 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=668ea5c97d4d1a0af90737a7e3d1b8dc27f55f82;p=telemeta.git Fix some deprecation warnings --- diff --git a/app/urls.py b/app/urls.py index b1950363..317b6d4c 100644 --- a/app/urls.py +++ b/app/urls.py @@ -1,8 +1,11 @@ # -*- coding: utf-8 -*- -from django.conf.urls import patterns, url, include +from django.conf.urls import url, include from django.http import HttpResponse +from django.views.i18n import javascript_catalog + import os + # Uncomment the next two lines to enable the admin: from django.contrib import admin admin.autodiscover() @@ -14,7 +17,7 @@ js_info_dict = { PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__)) robots_rules = open(PROJECT_ROOT + os.sep + 'robots.txt', 'r').read() -urlpatterns = patterns('', +urlpatterns = [ # Example: # (r'^sandbox/', include('sandbox.foo.urls')), @@ -23,15 +26,14 @@ urlpatterns = patterns('', # (r'^admin/doc/', include('django.contrib.admindocs.urls')), # Uncomment the next line to enable the admin: - (r'^admin/django/', include(admin.site.urls)), + url(r'^admin/django/', include(admin.site.urls)), #(r'^grappelli/', include('grappelli.urls')), # grappelli URLS # Telemeta - (r'^', include('telemeta.urls')), + url(r'^', include('telemeta.urls')), # Languages - (r'^i18n/', include('django.conf.urls.i18n')), - (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict), - (r'^robots\.txt$', lambda r: HttpResponse(robots_rules, mimetype="text/plain")), - - ) + url(r'^i18n/', include('django.conf.urls.i18n')), + url(r'^jsi18n/$', javascript_catalog, js_info_dict), + url(r'^robots\.txt$', lambda r: HttpResponse(robots_rules, mimetype="text/plain")), + ] diff --git a/telemeta/urls.py b/telemeta/urls.py index 8456c858..9ddf8259 100644 --- a/telemeta/urls.py +++ b/telemeta/urls.py @@ -20,10 +20,12 @@ # Authors: Olivier Guilyardi # Guillaume Pellerin -from django.conf.urls import patterns, url, include +from django.conf.urls import url, include from django.conf import settings +from django.contrib.auth import views as auth_views from django.views.generic.base import RedirectView, TemplateView from django.views.generic.list import ListView +from django.views.static import serve from telemeta.models import MediaItem, MediaCollection, MediaItemMarker, MediaCorpus, MediaFonds from telemeta.views import * from haystack.forms import * @@ -51,7 +53,7 @@ resource_view = ResourceView() export_extensions = "|".join(item_view.list_export_extensions()) -urlpatterns = patterns('', +urlpatterns = [ url(r'^$', home_view.home, name="telemeta-home"), url(r'^test', TemplateView.as_view(template_name = "telemeta/hello_world.html")), @@ -190,8 +192,8 @@ urlpatterns = patterns('', url(r'^oai/.*$', home_view.handle_oai_request, name="telemeta-oai"), # Authentication - url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'telemeta/login.html'}, name="telemeta-login"), - url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'telemeta/login.html'}, name="telemeta-login"), + 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'}, # name="telemeta-login"), url(r'^logout/$', home_view.logout, name="telemeta-logout"), @@ -211,12 +213,12 @@ urlpatterns = patterns('', url(r'^accounts/(?P[A-Za-z0-9._-]+)/rss/$', UserRevisionsFeed(), name="telemeta-user-rss"), # Registration - url(r'^accounts/password_change/$', 'django.contrib.auth.views.password_change', {'template_name': 'telemeta/registration/password_change_form.html'}, name="password_change"), - url(r'^accounts/password_change_done/$', 'django.contrib.auth.views.password_change_done', {'template_name': 'telemeta/registration/password_change_done.html'}, name="password_change_done"), - url(r'^accounts/password_reset/$', 'django.contrib.auth.views.password_reset', {'template_name': 'telemeta/registration/password_reset_form.html', 'email_template_name': 'registration/password_reset_email.html'}, name="password_reset"), - url(r'^accounts/password_reset_done/$', 'django.contrib.auth.views.password_reset_done', {'template_name': 'telemeta/registration/password_reset_done.html'}, name="password_reset_done"), - url(r'^accounts/password_reset_confirm/(?P[A-Za-z0-9._-]+)/(?P[A-Za-z0-9._-]+)/$', 'django.contrib.auth.views.password_reset_confirm', {'template_name': 'telemeta/registration/password_reset_confirm.html'}, name="password_reset_confirm"), - url(r'^accounts/password_reset_complete/$', 'django.contrib.auth.views.password_reset_complete', {'template_name': 'telemeta/registration/password_reset_complete.html'}, name="password_reset_complete"), + url(r'^accounts/password_change/$', auth_views.password_change, {'template_name': 'telemeta/registration/password_change_form.html'}, name="password_change"), + url(r'^accounts/password_change_done/$', auth_views.password_change_done, {'template_name': 'telemeta/registration/password_change_done.html'}, name="password_change_done"), + url(r'^accounts/password_reset/$', auth_views.password_reset, {'template_name': 'telemeta/registration/password_reset_form.html', 'email_template_name': 'registration/password_reset_email.html'}, name="password_reset"), + url(r'^accounts/password_reset_done/$', auth_views.password_reset_done, {'template_name': 'telemeta/registration/password_reset_done.html'}, name="password_reset_done"), + url(r'^accounts/password_reset_confirm/(?P[A-Za-z0-9._-]+)/(?P[A-Za-z0-9._-]+)/$', auth_views.password_reset_confirm, {'template_name': 'telemeta/registration/password_reset_confirm.html'}, name="password_reset_confirm"), + url(r'^accounts/password_reset_complete/$', auth_views.password_reset_complete, {'template_name': 'telemeta/registration/password_reset_complete.html'}, name="password_reset_complete"), # JSON RPC url(r'jsonrpc/$', jsonrpc_site.dispatch, name='jsonrpc_mountpoint'), @@ -230,19 +232,20 @@ urlpatterns = patterns('', # Static media # FIXME:need to move export dir from the cache - url(r'^media/cache/(?P.*)$', 'django.views.static.serve', {'document_root': settings.TELEMETA_CACHE_DIR,}), + url(r'^media/cache/(?P.*)$', serve, {'document_root': settings.TELEMETA_CACHE_DIR,}), url(r'^', include('jqchat.urls')), url(r'^timeside/', include('timeside.server.urls')), -) +] if settings.DEBUG and 'debug_toolbar' in settings.INSTALLED_APPS: import debug_toolbar - urlpatterns += patterns('', - url(r'^__debug__/', include(debug_toolbar.urls)), - # for the graphical browser/web console only, omissible - url(r'json/browse/', 'jsonrpc.views.browse', name="jsonrpc_browser"), - ) + import jsonrpc.views + urlpatterns += [ + url(r'^__debug__/', include(debug_toolbar.urls)), + # for the graphical browser/web console only, omissible + url(r'json/browse/', jsonrpc.views.browse, name="jsonrpc_browser"), + ] diff --git a/telemeta/views/core.py b/telemeta/views/core.py index 70e7cef6..b48feab3 100644 --- a/telemeta/views/core.py +++ b/telemeta/views/core.py @@ -46,7 +46,7 @@ from django.conf import settings from django.contrib import auth from django.contrib import messages from django.contrib.auth.decorators import login_required, permission_required -from django.core.context_processors import csrf +from django.template.context_processors import csrf from django.forms.models import modelformset_factory, inlineformset_factory from django.contrib.auth.models import User from django.utils.translation import ugettext diff --git a/telemeta/views/home.py b/telemeta/views/home.py index eee873c5..f9f4a0fd 100644 --- a/telemeta/views/home.py +++ b/telemeta/views/home.py @@ -55,12 +55,11 @@ class HomeView(object): sound_pub_item = sound_items[indexes[0]] sound_pub_items = [sound_items[indexes[i]] for i in range(1, N)] - context = RequestContext(request, { - 'page_content': pages.get_page_content(request, - 'home', ignore_slash_issue=True), - 'sound_pub_items': sound_pub_items, - 'sound_pub_item': sound_pub_item }) - return HttpResponse(template.render(context)) + context = {'page_content': pages.get_page_content(request, + 'home', ignore_slash_issue=True), + 'sound_pub_items': sound_pub_items, + 'sound_pub_item': sound_pub_item} + return HttpResponse(template.render(context, request)) def lists(self, request, range_playlist): """Render the home page"""