urls pretty format

nitely · Mar 31, 2015 · 1829faf · 1829faf
1 parent caf2d1d
commit 1829faf
Show file tree

Hide file tree

Showing 25 changed files with 235 additions and 206 deletions.
diff --git a/example/project/urls.py b/example/project/urls.py
@@ -12,19 +12,20 @@
 admin.site.login = login_required(admin.site.login)
 
 
-urlpatterns = patterns('',
-                       # Examples:
-                       # url(r'^$', 'example.views.home', name='home'),
-                       # url(r'^example/', include('example.foo.urls')),
+urlpatterns = patterns(
+    '',
+    # Examples:
+    # url(r'^$', 'example.views.home', name='home'),
+    # url(r'^example/', include('example.foo.urls')),
 
-                       url(r'^', include('spirit.urls')),
+    url(r'^', include('spirit.urls')),
 
-                       # Uncomment the admin/doc line below to enable admin documentation:
-                       # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
+    # Uncomment the admin/doc line below to enable admin documentation:
+    # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
 
-                       # Uncomment the next line to enable the admin:
-                       url(r'^admin/', include(admin.site.urls)),
-                       )
+    # Uncomment the next line to enable the admin:
+    url(r'^admin/', include(admin.site.urls)),
+    )
 
 if settings.DEBUG:
     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/spirit/settings.py b/spirit/settings.py
@@ -31,6 +31,8 @@
 
 ST_UNICODE_SLUGS = True
 
+ST_UNIQUE_EMAILS = True
+
 #
 # Django & Spirit settings defined below...
 #

diff --git a/spirit/urls/__init__.py b/spirit/urls/__init__.py
@@ -5,24 +5,26 @@
 from django.conf.urls import patterns, include, url
 
 
-urls = patterns('',
-                url(r'^$', 'spirit.views.topic.topic_active_list', name='index'),
-                url(r'^st/admin/', include('spirit.urls.admin')),
-                url(r'^category/', include('spirit.urls.category')),
-                url(r'^topic/', include('spirit.urls.topic')),
-                url(r'^topic/moderate/', include('spirit.urls.topic_moderate')),
-                url(r'^topic/unread/', include('spirit.urls.topic_unread')),
-                url(r'^topic/notification/', include('spirit.urls.topic_notification')),
-                url(r'^topic/favorite/', include('spirit.urls.topic_favorite')),
-                url(r'^topic/private/', include('spirit.urls.topic_private')),
-                url(r'^topic/poll/', include('spirit.urls.topic_poll')),
-                url(r'^comment/', include('spirit.urls.comment')),
-                url(r'^comment/bookmark/', include('spirit.urls.comment_bookmark')),
-                url(r'^comment/flag/', include('spirit.urls.comment_flag')),
-                url(r'^comment/history/', include('spirit.urls.comment_history')),
-                url(r'^comment/like/', include('spirit.urls.comment_like')),
-                url(r'^user/', include('spirit.urls.user')),
-                url(r'^search/', include('spirit.urls.search')),
-                )
+urls = patterns(
+    '',
+
+    url(r'^$', 'spirit.views.topic.topic_active_list', name='index'),
+    url(r'^st/admin/', include('spirit.urls.admin')),
+    url(r'^category/', include('spirit.urls.category')),
+    url(r'^topic/', include('spirit.urls.topic')),
+    url(r'^topic/moderate/', include('spirit.urls.topic_moderate')),
+    url(r'^topic/unread/', include('spirit.urls.topic_unread')),
+    url(r'^topic/notification/', include('spirit.urls.topic_notification')),
+    url(r'^topic/favorite/', include('spirit.urls.topic_favorite')),
+    url(r'^topic/private/', include('spirit.urls.topic_private')),
+    url(r'^topic/poll/', include('spirit.urls.topic_poll')),
+    url(r'^comment/', include('spirit.urls.comment')),
+    url(r'^comment/bookmark/', include('spirit.urls.comment_bookmark')),
+    url(r'^comment/flag/', include('spirit.urls.comment_flag')),
+    url(r'^comment/history/', include('spirit.urls.comment_history')),
+    url(r'^comment/like/', include('spirit.urls.comment_like')),
+    url(r'^user/', include('spirit.urls.user')),
+    url(r'^search/', include('spirit.urls.search')),
+    )
 
 urlpatterns = patterns('', url(r'^', include(urls, namespace="spirit", app_name="spirit")))
diff --git a/spirit/urls/admin/__init__.py b/spirit/urls/admin/__init__.py
@@ -5,12 +5,14 @@
 from django.conf.urls import patterns, include, url
 
 
-urlpatterns = patterns('',
-                       url(r'^$', 'spirit.views.admin.index.dashboard', name='admin'),
-                       url(r'^index/', include('spirit.urls.admin.index')),
-                       url(r'^category/', include('spirit.urls.admin.category')),
-                       url(r'^comment/flag/', include('spirit.urls.admin.comment_flag')),
-                       url(r'^config/', include('spirit.urls.admin.config')),
-                       url(r'^topic/', include('spirit.urls.admin.topic')),
-                       url(r'^user/', include('spirit.urls.admin.user')),
-                       )
+urlpatterns = patterns(
+    '',
+
+    url(r'^$', 'spirit.views.admin.index.dashboard', name='admin'),
+    url(r'^index/', include('spirit.urls.admin.index')),
+    url(r'^category/', include('spirit.urls.admin.category')),
+    url(r'^comment/flag/', include('spirit.urls.admin.comment_flag')),
+    url(r'^config/', include('spirit.urls.admin.config')),
+    url(r'^topic/', include('spirit.urls.admin.topic')),
+    url(r'^user/', include('spirit.urls.admin.user')),
+    )
diff --git a/spirit/urls/admin/category.py b/spirit/urls/admin/category.py
@@ -5,9 +5,11 @@
 from django.conf.urls import patterns, url
 
 
-urlpatterns = patterns("spirit.views.admin.category",
-                       url(r'^$', 'category_list', name='admin-category'),
-                       url(r'^list/$', 'category_list', name='admin-category-list'),
-                       url(r'^create/$', 'category_create', name='admin-category-create'),
-                       url(r'^update/(?P<category_id>\d+)/$', 'category_update', name='admin-category-update'),
-                       )
+urlpatterns = patterns(
+    "spirit.views.admin.category",
+
+    url(r'^$', 'category_list', name='admin-category'),
+    url(r'^list/$', 'category_list', name='admin-category-list'),
+    url(r'^create/$', 'category_create', name='admin-category-create'),
+    url(r'^update/(?P<category_id>\d+)/$', 'category_update', name='admin-category-update'),
+    )
diff --git a/spirit/urls/admin/comment_flag.py b/spirit/urls/admin/comment_flag.py
@@ -5,9 +5,11 @@
 from django.conf.urls import patterns, url
 
 
-urlpatterns = patterns("spirit.views.admin.comment_flag",
-                       url(r'^$', 'flag_open', name='admin-flag'),
-                       url(r'^open/$', 'flag_open', name='admin-flag-open'),
-                       url(r'^closed/$', 'flag_closed', name='admin-flag-closed'),
-                       url(r'^(?P<pk>\d+)/$', 'flag_detail', name='admin-flag-detail'),
-                       )
+urlpatterns = patterns(
+    "spirit.views.admin.comment_flag",
+
+    url(r'^$', 'flag_open', name='admin-flag'),
+    url(r'^open/$', 'flag_open', name='admin-flag-open'),
+    url(r'^closed/$', 'flag_closed', name='admin-flag-closed'),
+    url(r'^(?P<pk>\d+)/$', 'flag_detail', name='admin-flag-detail'),
+    )
diff --git a/spirit/urls/admin/config.py b/spirit/urls/admin/config.py
@@ -5,6 +5,7 @@
 from django.conf.urls import patterns, url
 
 
-urlpatterns = patterns("spirit.views.admin.config",
-                       url(r'^basic/$', 'config_basic', name='admin-config-basic'),
-                       )
+urlpatterns = patterns(
+    "spirit.views.admin.config",
+    url(r'^basic/$', 'config_basic', name='admin-config-basic'),
+    )
diff --git a/spirit/urls/admin/index.py b/spirit/urls/admin/index.py
@@ -5,6 +5,7 @@
 from django.conf.urls import patterns, url
 
 
-urlpatterns = patterns("spirit.views.admin.index",
-                       url(r'^$', 'dashboard', name='admin-dashboard'),
-                       )
+urlpatterns = patterns(
+    "spirit.views.admin.index",
+    url(r'^$', 'dashboard', name='admin-dashboard'),
+    )
diff --git a/spirit/urls/admin/topic.py b/spirit/urls/admin/topic.py
@@ -5,9 +5,11 @@
 from django.conf.urls import patterns, url
 
 
-urlpatterns = patterns("spirit.views.admin.topic",
-                       url(r'^$', 'topic_deleted', name='admin-topic'),
-                       url(r'^deleted/$', 'topic_deleted', name='admin-topic-deleted'),
-                       url(r'^closed/$', 'topic_closed', name='admin-topic-closed'),
-                       url(r'^pinned/$', 'topic_pinned', name='admin-topic-pinned'),
-                       )
+urlpatterns = patterns(
+    "spirit.views.admin.topic",
+
+    url(r'^$', 'topic_deleted', name='admin-topic'),
+    url(r'^deleted/$', 'topic_deleted', name='admin-topic-deleted'),
+    url(r'^closed/$', 'topic_closed', name='admin-topic-closed'),
+    url(r'^pinned/$', 'topic_pinned', name='admin-topic-pinned'),
+    )
diff --git a/spirit/urls/admin/user.py b/spirit/urls/admin/user.py
@@ -5,11 +5,13 @@
 from django.conf.urls import patterns, url
 
 
-urlpatterns = patterns("spirit.views.admin.user",
-                       url(r'^$', 'user_list', name='admin-user'),
-                       url(r'^edit/(?P<user_id>\d+)/$', 'user_edit', name='admin-user-edit'),
-                       url(r'^list/$', 'user_list', name='admin-user-list'),
-                       url(r'^admins/$', 'user_admins', name='admin-user-admins'),
-                       url(r'^mods/$', 'user_mods', name='admin-user-mods'),
-                       url(r'^unactive/$', 'user_unactive', name='admin-user-unactive'),
-                       )
+urlpatterns = patterns(
+    "spirit.views.admin.user",
+
+    url(r'^$', 'user_list', name='admin-user'),
+    url(r'^edit/(?P<user_id>\d+)/$', 'user_edit', name='admin-user-edit'),
+    url(r'^list/$', 'user_list', name='admin-user-list'),
+    url(r'^admins/$', 'user_admins', name='admin-user-admins'),
+    url(r'^mods/$', 'user_mods', name='admin-user-mods'),
+    url(r'^unactive/$', 'user_unactive', name='admin-user-unactive'),
+    )
diff --git a/spirit/urls/category.py b/spirit/urls/category.py
@@ -7,9 +7,11 @@
 from spirit.views.category import CategoryList
 
 
-urlpatterns = patterns("spirit.views.category",
-                       url(r'^$', CategoryList.as_view(), name='category-list'),
+urlpatterns = patterns(
+    "spirit.views.category",
 
-                       url(r'^(?P<pk>\d+)/$', 'category_detail', kwargs={'slug': "", }, name='category-detail'),
-                       url(r'^(?P<pk>\d+)/(?P<slug>[\w-]+)/$', 'category_detail', name='category-detail'),
-                       )
+    url(r'^$', CategoryList.as_view(), name='category-list'),
+
+    url(r'^(?P<pk>\d+)/$', 'category_detail', kwargs={'slug': "", }, name='category-detail'),
+    url(r'^(?P<pk>\d+)/(?P<slug>[\w-]+)/$', 'category_detail', name='category-detail'),
+    )
diff --git a/spirit/urls/comment.py b/spirit/urls/comment.py
@@ -5,20 +5,18 @@
 from django.conf.urls import patterns, url
 
 
-urlpatterns = patterns("spirit.views.comment",
-                       url(r'^(?P<topic_id>\d+)/publish/$', 'comment_publish', name='comment-publish'),
-                       url(r'^(?P<topic_id>\d+)/publish/(?P<pk>\d+)/quote/$',
-                           'comment_publish',
-                           name='comment-publish'),
-
-                       url(r'^(?P<pk>\d+)/update/$', 'comment_update', name='comment-update'),
-                       url(r'^(?P<pk>\d+)/find/$', 'comment_find', name='comment-find'),
-                       url(r'^(?P<topic_id>\d+)/move/$', 'comment_move', name='comment-move'),
-
-                       url(r'^(?P<pk>\d+)/delete/$', 'comment_delete', name='comment-delete'),
-                       url(r'^(?P<pk>\d+)/undelete/$',
-                           'comment_delete',
-                           kwargs={'remove': False, }, name='comment-undelete'),
-
-                       url(r'^upload/$', 'comment_image_upload_ajax', name='comment-image-upload-ajax'),
-                       )
+urlpatterns = patterns(
+    "spirit.views.comment",
+
+    url(r'^(?P<topic_id>\d+)/publish/$', 'comment_publish', name='comment-publish'),
+    url(r'^(?P<topic_id>\d+)/publish/(?P<pk>\d+)/quote/$', 'comment_publish', name='comment-publish'),
+
+    url(r'^(?P<pk>\d+)/update/$', 'comment_update', name='comment-update'),
+    url(r'^(?P<pk>\d+)/find/$', 'comment_find', name='comment-find'),
+    url(r'^(?P<topic_id>\d+)/move/$', 'comment_move', name='comment-move'),
+
+    url(r'^(?P<pk>\d+)/delete/$', 'comment_delete', name='comment-delete'),
+    url(r'^(?P<pk>\d+)/undelete/$', 'comment_delete', kwargs={'remove': False, }, name='comment-undelete'),
+
+    url(r'^upload/$', 'comment_image_upload_ajax', name='comment-image-upload-ajax'),
+    )
diff --git a/spirit/urls/comment_bookmark.py b/spirit/urls/comment_bookmark.py
@@ -5,7 +5,8 @@
 from django.conf.urls import patterns, url
 
 
-urlpatterns = patterns("spirit.views.comment_bookmark",
-                       url(r'^(?P<topic_id>\d+)/create/$', 'bookmark_create', name='bookmark-create'),
-                       url(r'^(?P<topic_id>\d+)/find/$', 'bookmark_find', name='bookmark-find'),
-                       )
+urlpatterns = patterns(
+    "spirit.views.comment_bookmark",
+    url(r'^(?P<topic_id>\d+)/create/$', 'bookmark_create', name='bookmark-create'),
+    url(r'^(?P<topic_id>\d+)/find/$', 'bookmark_find', name='bookmark-find'),
+    )
diff --git a/spirit/urls/comment_flag.py b/spirit/urls/comment_flag.py
@@ -5,6 +5,7 @@
 from django.conf.urls import patterns, url
 
 
-urlpatterns = patterns("spirit.views.comment_flag",
-                       url(r'^(?P<comment_id>\d+)/create/$', 'flag_create', name='flag-create'),
-                       )
+urlpatterns = patterns(
+    "spirit.views.comment_flag",
+    url(r'^(?P<comment_id>\d+)/create/$', 'flag_create', name='flag-create'),
+    )
diff --git a/spirit/urls/comment_history.py b/spirit/urls/comment_history.py
@@ -5,6 +5,7 @@
 from django.conf.urls import patterns, url
 
 
-urlpatterns = patterns("spirit.views.comment_history",
-                       url(r'^(?P<comment_id>\d+)/$', 'comment_history_detail', name='comment-history'),
-                       )
+urlpatterns = patterns(
+    "spirit.views.comment_history",
+    url(r'^(?P<comment_id>\d+)/$', 'comment_history_detail', name='comment-history'),
+    )
diff --git a/spirit/urls/comment_like.py b/spirit/urls/comment_like.py
@@ -5,7 +5,9 @@
 from django.conf.urls import patterns, url
 
 
-urlpatterns = patterns("spirit.views.comment_like",
-                       url(r'^(?P<comment_id>\d+)/create/$', 'like_create', name='like-create'),
-                       url(r'^(?P<pk>\d+)/delete/$', 'like_delete', name='like-delete'),
-                       )
+urlpatterns = patterns(
+    "spirit.views.comment_like",
+
+    url(r'^(?P<comment_id>\d+)/create/$', 'like_create', name='like-create'),
+    url(r'^(?P<pk>\d+)/delete/$', 'like_delete', name='like-delete'),
+    )
diff --git a/spirit/urls/search.py b/spirit/urls/search.py
@@ -9,9 +9,8 @@
 from ..forms.search import AdvancedSearchForm
 
 
-urlpatterns = patterns("",
-                       url(r'^$', login_required(SearchView(
-                           template='spirit/search/search.html',
-                           form_class=AdvancedSearchForm
-                           )), name='search'),
-                       )
+urlpatterns = patterns(
+    "",
+    url(r'^$', login_required(SearchView(template='spirit/search/search.html', form_class=AdvancedSearchForm)),
+        name='search'),
+    )
diff --git a/spirit/urls/topic.py b/spirit/urls/topic.py
@@ -5,14 +5,16 @@
 from django.conf.urls import patterns, url
 
 
-urlpatterns = patterns("spirit.views.topic",
-                       url(r'^publish/$', 'topic_publish', name='topic-publish'),
-                       url(r'^publish/(?P<category_id>\d+)/$', 'topic_publish', name='topic-publish'),
+urlpatterns = patterns(
+    "spirit.views.topic",
 
-                       url(r'^update/(?P<pk>\d+)/$', 'topic_update', name='topic-update'),
+    url(r'^publish/$', 'topic_publish', name='topic-publish'),
+    url(r'^publish/(?P<category_id>\d+)/$', 'topic_publish', name='topic-publish'),
 
-                       url(r'^(?P<pk>\d+)/$', 'topic_detail', kwargs={'slug': "", }, name='topic-detail'),
-                       url(r'^(?P<pk>\d+)/(?P<slug>[\w-]+)/$', 'topic_detail', name='topic-detail'),
+    url(r'^update/(?P<pk>\d+)/$', 'topic_update', name='topic-update'),
 
-                       url(r'^active/$', 'topic_active_list', name='topic-active'),
-                       )
+    url(r'^(?P<pk>\d+)/$', 'topic_detail', kwargs={'slug': "", }, name='topic-detail'),
+    url(r'^(?P<pk>\d+)/(?P<slug>[\w-]+)/$', 'topic_detail', name='topic-detail'),
+
+    url(r'^active/$', 'topic_active_list', name='topic-active'),
+    )
diff --git a/spirit/urls/topic_favorite.py b/spirit/urls/topic_favorite.py
@@ -5,7 +5,9 @@
 from django.conf.urls import patterns, url
 
 
-urlpatterns = patterns("spirit.views.topic_favorite",
-                       url(r'^(?P<topic_id>\d+)/create/$', 'favorite_create', name='favorite-create'),
-                       url(r'^(?P<pk>\d+)/delete/$', 'favorite_delete', name='favorite-delete'),
-                       )
+urlpatterns = patterns(
+    "spirit.views.topic_favorite",
+
+    url(r'^(?P<topic_id>\d+)/create/$', 'favorite_create', name='favorite-create'),
+    url(r'^(?P<pk>\d+)/delete/$', 'favorite_delete', name='favorite-delete'),
+    )
diff --git a/spirit/urls/topic_notification.py b/spirit/urls/topic_notification.py
@@ -5,10 +5,12 @@
 from django.conf.urls import patterns, url
 
 
-urlpatterns = patterns("spirit.views.topic_notification",
-                       url(r'^$', 'notification_list_unread', name='topic-notification-list-unread'),
-                       url(r'^list/$', 'notification_list', name='topic-notification-list'),
-                       url(r'^(?P<topic_id>\d+)/create/$', 'notification_create', name='topic-notification-create'),
-                       url(r'^(?P<pk>\d+)/update/$', 'notification_update', name='topic-notification-update'),
-                       url(r'^ajax/$', 'notification_ajax', name='topic-notification-ajax'),
-                       )
+urlpatterns = patterns(
+    "spirit.views.topic_notification",
+
+    url(r'^$', 'notification_list_unread', name='topic-notification-list-unread'),
+    url(r'^list/$', 'notification_list', name='topic-notification-list'),
+    url(r'^(?P<topic_id>\d+)/create/$', 'notification_create', name='topic-notification-create'),
+    url(r'^(?P<pk>\d+)/update/$', 'notification_update', name='topic-notification-update'),
+    url(r'^ajax/$', 'notification_ajax', name='topic-notification-ajax'),
+    )
diff --git a/spirit/urls/topic_poll.py b/spirit/urls/topic_poll.py
@@ -5,8 +5,10 @@
 from django.conf.urls import patterns, url
 
 
-urlpatterns = patterns("spirit.views.topic_poll",
-                       url(r'^update/(?P<pk>\d+)/$', 'poll_update', name='poll-update'),
-                       url(r'^close/(?P<pk>\d+)/$', 'poll_close', name='poll-close'),
-                       url(r'^vote/(?P<pk>\d+)/$', 'poll_vote', name='poll-vote'),
-                       )
+urlpatterns = patterns(
+    "spirit.views.topic_poll",
+
+    url(r'^update/(?P<pk>\d+)/$', 'poll_update', name='poll-update'),
+    url(r'^close/(?P<pk>\d+)/$', 'poll_close', name='poll-close'),
+    url(r'^vote/(?P<pk>\d+)/$', 'poll_vote', name='poll-vote'),
+    )