Commit f63f261967354cb4dd3e40c46d5a57da6c4eca6e
1 parent
171f8c2a
Removed deprecated patterns usage
Refs #49.
Showing
4 changed files
with
20 additions
and
24 deletions
| 1 | -from django.conf.urls import patterns, url | 1 | +from django.conf.urls import url |
| 2 | from django.contrib.contenttypes.views import shortcut | 2 | from django.contrib.contenttypes.views import shortcut |
| 3 | 3 | ||
| 4 | from .views.comments import post_comment, comment_done | 4 | from .views.comments import post_comment, comment_done |
| @@ -7,7 +7,7 @@ from .views.moderation import ( | @@ -7,7 +7,7 @@ from .views.moderation import ( | ||
| 7 | ) | 7 | ) |
| 8 | 8 | ||
| 9 | 9 | ||
| 10 | -urlpatterns = patterns('', | 10 | +urlpatterns = [ |
| 11 | url(r'^post/$', post_comment, name='comments-post-comment'), | 11 | url(r'^post/$', post_comment, name='comments-post-comment'), |
| 12 | url(r'^posted/$', comment_done, name='comments-comment-done'), | 12 | url(r'^posted/$', comment_done, name='comments-comment-done'), |
| 13 | url(r'^flag/(\d+)/$', flag, name='comments-flag'), | 13 | url(r'^flag/(\d+)/$', flag, name='comments-flag'), |
| @@ -16,9 +16,6 @@ urlpatterns = patterns('', | @@ -16,9 +16,6 @@ urlpatterns = patterns('', | ||
| 16 | url(r'^deleted/$', delete_done, name='comments-delete-done'), | 16 | url(r'^deleted/$', delete_done, name='comments-delete-done'), |
| 17 | url(r'^approve/(\d+)/$', approve, name='comments-approve'), | 17 | url(r'^approve/(\d+)/$', approve, name='comments-approve'), |
| 18 | url(r'^approved/$', approve_done, name='comments-approve-done'), | 18 | url(r'^approved/$', approve_done, name='comments-approve-done'), |
| 19 | -) | ||
| 20 | 19 | ||
| 21 | -urlpatterns += patterns('', | ||
| 22 | - url(r'^cr/(\d+)/(.+)/$', shortcut, | ||
| 23 | - name='comments-url-redirect'), | ||
| 24 | -) | 20 | + url(r'^cr/(\d+)/(.+)/$', shortcut, name='comments-url-redirect'), |
| 21 | +] |
| 1 | from __future__ import absolute_import | 1 | from __future__ import absolute_import |
| 2 | 2 | ||
| 3 | -from django.conf.urls import patterns, url | 3 | +from django.conf.urls import url |
| 4 | from django.contrib.contenttypes.views import shortcut | 4 | from django.contrib.contenttypes.views import shortcut |
| 5 | 5 | ||
| 6 | from django_comments.feeds import LatestCommentFeed | 6 | from django_comments.feeds import LatestCommentFeed |
| @@ -12,14 +12,13 @@ feeds = { | @@ -12,14 +12,13 @@ feeds = { | ||
| 12 | 'comments': LatestCommentFeed, | 12 | 'comments': LatestCommentFeed, |
| 13 | } | 13 | } |
| 14 | 14 | ||
| 15 | -urlpatterns = patterns('', | 15 | +urlpatterns = [ |
| 16 | url(r'^post/$', views.custom_submit_comment), | 16 | url(r'^post/$', views.custom_submit_comment), |
| 17 | url(r'^flag/(\d+)/$', views.custom_flag_comment), | 17 | url(r'^flag/(\d+)/$', views.custom_flag_comment), |
| 18 | url(r'^delete/(\d+)/$', views.custom_delete_comment), | 18 | url(r'^delete/(\d+)/$', views.custom_delete_comment), |
| 19 | url(r'^approve/(\d+)/$', views.custom_approve_comment), | 19 | url(r'^approve/(\d+)/$', views.custom_approve_comment), |
| 20 | + | ||
| 20 | url(r'^cr/(\d+)/(.+)/$', shortcut, name='comments-url-redirect'), | 21 | url(r'^cr/(\d+)/(.+)/$', shortcut, name='comments-url-redirect'), |
| 21 | -) | ||
| 22 | 22 | ||
| 23 | -urlpatterns += patterns('', | ||
| 24 | - (r'^rss/comments/$', LatestCommentFeed()), | ||
| 25 | -) | 23 | + url(r'^rss/comments/$', LatestCommentFeed()), |
| 24 | +] |
| 1 | -from django.conf.urls import patterns, include | 1 | +from django.conf.urls import include, url |
| 2 | from django.contrib import admin | 2 | from django.contrib import admin |
| 3 | from django_comments.admin import CommentsAdmin | 3 | from django_comments.admin import CommentsAdmin |
| 4 | from django_comments.models import Comment | 4 | from django_comments.models import Comment |
| @@ -13,7 +13,7 @@ admin_site2 = admin.AdminSite() | @@ -13,7 +13,7 @@ admin_site2 = admin.AdminSite() | ||
| 13 | admin_site2.disable_action('delete_selected') | 13 | admin_site2.disable_action('delete_selected') |
| 14 | admin_site2.register(Comment, CommentsAdmin) | 14 | admin_site2.register(Comment, CommentsAdmin) |
| 15 | 15 | ||
| 16 | -urlpatterns = patterns('', | ||
| 17 | - (r'^admin/', include(admin_site.urls)), | ||
| 18 | - (r'^admin2/', include(admin_site2.urls)), | ||
| 19 | -) | 16 | +urlpatterns = [ |
| 17 | + url(r'^admin/', include(admin_site.urls)), | ||
| 18 | + url(r'^admin2/', include(admin_site2.urls)), | ||
| 19 | +] |
| 1 | -from django.conf.urls import patterns, include | 1 | +from django.conf.urls import include, url |
| 2 | from django.contrib.auth.views import login, logout | 2 | from django.contrib.auth.views import login, logout |
| 3 | 3 | ||
| 4 | 4 | ||
| 5 | -urlpatterns = patterns('', | ||
| 6 | - (r'^', include('django_comments.urls')), | 5 | +urlpatterns = [ |
| 6 | + url(r'^', include('django_comments.urls')), | ||
| 7 | 7 | ||
| 8 | # Provide the auth system login and logout views | 8 | # Provide the auth system login and logout views |
| 9 | - (r'^accounts/login/$', login, {'template_name': 'login.html'}), | ||
| 10 | - (r'^accounts/logout/$', logout), | ||
| 11 | -) | 9 | + url(r'^accounts/login/$', login, {'template_name': 'login.html'}), |
| 10 | + url(r'^accounts/logout/$', logout), | ||
| 11 | +] |
Please
register
or
login
to post a comment