django 1.9

[redakcja.git] / redakcja / urls.py

diff --git a/redakcja/urls.py b/redakcja/urls.py
index da12c29..0fe2aac 100644 (file)
--- a/redakcja/urls.py
+++ b/redakcja/urls.py
@@ -1,51 +1,43 @@
 # -*- coding: utf-8 -*-
 
-from django.conf.urls import include, patterns, url
+from django.conf.urls import include, url
 from django.contrib import admin
 from django.conf import settings
 from django.conf.urls.static import static
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+from django.views.i18n import javascript_catalog
 import forms_builder.forms.urls
 
+import redakcja.views
 
 admin.autodiscover()
 
-urlpatterns = patterns(
-    '',
+urlpatterns = (
     # Auth
-    # url(r'^accounts/login/$', 'django_cas.views.login', name='login'),
-    # url(r'^accounts/logout/$', 'django_cas.views.logout', name='logout'),
-    # url(r'^accounts/login/$', 'django.contrib.auth.views.login', name='login'),
-    # url(r'^accounts/logout/$', 'django.contrib.auth.views.login', name='logout'),
-    # url(r'^admin/login/$', 'django_cas.views.login', name='login'),
-    # url(r'^admin/logout/$', 'django_cas.views.logout', name='logout'),
     url('^accounts/', include('django.contrib.auth.urls')),
 
     # Admin panel
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    (r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
 
-    url(r'^$', 'redakcja.views.main'),
-    url(r'^register$', 'redakcja.views.register', name='register'),
+    url(r'^$', redakcja.views.main),
+    url(r'^register$', redakcja.views.register, name='register'),
     url(r'^documents/', include('catalogue.urls')),
     url(r'^editor/', include('wiki.urls')),
     url(r'^organizations/', include('organizations.urls')),
     url(r'^forms/', include(forms_builder.forms.urls)),
 
     url(r'^i18n/', include('django.conf.urls.i18n')),
-    (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', dict(packages=['wiki'])),
-
+    url(r'^jsi18n/$', javascript_catalog, {'packages': ['wiki']}, name='javascript_catalog'),
 )
 
 if settings.DEBUG:
-    urlpatterns += staticfiles_urlpatterns()
-    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+    urlpatterns += tuple(staticfiles_urlpatterns())
+    urlpatterns += tuple(static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT))
 
 if getattr(settings, 'SERVE_FILES_WITH_DEBUG_FALSE', False):
-    urlpatterns += patterns(
-        '',
-        (r'^%s(?P<path>.*)$' % settings.STATIC_URL[1:],
-         'django.views.static.serve', {'document_root': settings.STATIC_ROOT}),
-        (r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:],
-         'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
+    from django.views.static import serve
+    urlpatterns += (
+        (r'^%s(?P<path>.*)$' % settings.STATIC_URL[1:], serve, {'document_root': settings.STATIC_ROOT}),
+        (r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:], serve, {'document_root': settings.MEDIA_ROOT}),
     )