diff options
| author | Aurélien Bompard <aurelien@bompard.org> | 2013-02-27 18:49:30 +0100 |
|---|---|---|
| committer | Aurélien Bompard <aurelien@bompard.org> | 2013-02-27 19:11:18 +0100 |
| commit | 628d011c865da76054d6b72ddf3f0f5e7341f649 (patch) | |
| tree | 7fee2afb61b64c1cfa2a030ff535038f10f65dfd /hyperkitty/urls.py | |
| parent | 64ee6215510021a75fdb3ff188514ab8bace2f86 (diff) | |
| download | hyperkitty-628d011c865da76054d6b72ddf3f0f5e7341f649.tar.gz hyperkitty-628d011c865da76054d6b72ddf3f0f5e7341f649.tar.xz hyperkitty-628d011c865da76054d6b72ddf3f0f5e7341f649.zip | |
Migrate to class-based generic views
https://docs.djangoproject.com/en/1.4/topics/generic-views-migration/#mimetype
Required by Django >= 1.5
Diffstat (limited to 'hyperkitty/urls.py')
| -rw-r--r-- | hyperkitty/urls.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/hyperkitty/urls.py b/hyperkitty/urls.py index f6cfa18..df580e6 100644 --- a/hyperkitty/urls.py +++ b/hyperkitty/urls.py @@ -22,7 +22,7 @@ from django.conf.urls.defaults import patterns, include, url from django.conf import settings -from django.views.generic.simple import direct_to_template +from django.views.generic.base import TemplateView from api import EmailResource, ThreadResource, SearchResource from django.contrib.staticfiles.urls import staticfiles_urlpatterns @@ -33,6 +33,10 @@ from django.contrib.auth.views import logout as logout_view from django.contrib import admin admin.autodiscover() +from hyperkitty.views import TextTemplateView + + + urlpatterns = patterns('hyperkitty.views', # Index url(r'^/$', 'pages.index', name='index'), @@ -88,7 +92,7 @@ urlpatterns = patterns('hyperkitty.views', # REST API - url(r'^api/$', direct_to_template, {"template": "api.html"}), + url(r'^api/$', TemplateView.as_view(template_name="api.html")), url(r'^api/email\/(?P<mlist_fqdn>[^/@]+@[^/@]+)\/(?P<hashid>.*)/', EmailResource.as_view(), name="api_email"), url(r'^api/thread\/(?P<mlist_fqdn>[^/@]+@[^/@]+)\/(?P<threadid>.*)/', @@ -103,8 +107,7 @@ urlpatterns = patterns('hyperkitty.views', url(r'^admin/', include(admin.site.urls), {"SSL": True}), # Robots.txt - url(r'^robots\.txt$', direct_to_template, - {'template': 'robots.txt', 'mimetype': 'text/plain'}), + url(r'^robots\.txt$', TextTemplateView.as_view(template_name="robots.txt")), # Social Auth url(r'', include('social_auth.urls'), {"SSL": True}), |