[Django 1.11] Feature removed in Django 1.9. Use shortcut to get current site, and update urls

seahub/api2/urls.py

@@ -1,5 +1,5 @@
 # Copyright (c) 2012-2016 Seafile Ltd.
-from django.conf.urls import patterns, url, include
+from django.conf.urls import url, include
 
 from .views import *
 from .views_misc import ServerInfoView
@@ -18,7 +18,7 @@ from .endpoints.group_discussion import GroupDiscussion
 from .endpoints.send_share_link_email import SendShareLinkView
 from .endpoints.send_upload_link_email import SendUploadLinkView
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^ping/$', Ping.as_view()),
     url(r'^auth/ping/$', AuthPing.as_view()),
     url(r'^auth-token/', ObtainAuthToken.as_view()),
@@ -107,18 +107,18 @@ urlpatterns = patterns('',
     url(r'^repos/(?P<repo_id>[-0-9-a-f]{36})/fileops/delete/$', OpDeleteView.as_view(), name="api2-fileops-delete"),
     url(r'^repos/(?P<repo_id>[-0-9-a-f]{36})/fileops/copy/$', OpCopyView.as_view(), name="api2-fileops-copy"),
     url(r'^repos/(?P<repo_id>[-0-9-a-f]{36})/fileops/move/$', OpMoveView.as_view(), name="api2-fileops-move"),
-)
+]
 
 # serve office converter static files
 from seahub.utils import HAS_OFFICE_CONVERTER
 if HAS_OFFICE_CONVERTER:
     from seahub.utils import OFFICE_HTML_DIR
-    urlpatterns += patterns('',
+    urlpatterns += [
         url(r'^office-convert/static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': OFFICE_HTML_DIR}, name='api_office_convert_static'),
-    )
-    urlpatterns += patterns('',
+    ]
+    urlpatterns += [
         url(r'^office-convert/status/$', OfficeConvertQueryStatus.as_view()),
-    )
-    urlpatterns += patterns('',
+    ]
+    urlpatterns += [
         url(r'^office-convert/generate/repos/(?P<repo_id>[-0-9-a-f]{36})/$', OfficeGenerateView.as_view()),
-    )
+    ]

seahub/avatar/urls.py

@@ -1,9 +1,9 @@
 # Copyright (c) 2012-2016 Seafile Ltd.
-from django.conf.urls import patterns, url
-
-urlpatterns = patterns('seahub.avatar.views',
-    url('^add/$', 'add', name='avatar_add'),
+from django.conf.urls import url
+from .views import add, render_primary
+urlpatterns = [
+    url('^add/$', add, name='avatar_add'),
 #    url('^change/$', 'change', name='avatar_change'),
 #    url('^delete/$', 'delete', name='avatar_delete'),
-    url('^render_primary/(?P<user>[^/]+)/(?P<size>[\d]+)/$', 'render_primary', name='avatar_render_primary'),
-)
+    url('^render_primary/(?P<user>[^/]+)/(?P<size>[\d]+)/$', render_primary, name='avatar_render_primary'),
+]

seahub/base/registration_urls.py

@@ -1,5 +1,5 @@
 # Copyright (c) 2012-2016 Seafile Ltd.
-from django.conf.urls import patterns, url, include
+from django.conf.urls import url, include
 from django.views.generic import TemplateView
 from django.conf import settings
 
@@ -16,7 +16,7 @@ reg_dict = { 'backend': 'seahub.base.accounts.RegistrationBackend',
              'form_class': form_class,
              }
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^activate/complete/$',
         TemplateView.as_view(template_name='registration/activation_complete.html'),
         name='registration_activation_complete'),
@@ -28,19 +28,19 @@ urlpatterns = patterns('',
         activate,
         { 'backend': 'seahub.base.accounts.RegistrationBackend', },
         name='registration_activate'),
-                       (r'', include('registration.auth_urls')),
-                       )
+    url(r'', include('registration.auth_urls')),
+]
 
 try:
     from seahub.settings import CLOUD_MODE
 except ImportError:
     CLOUD_MODE = False
 
-urlpatterns += patterns('',
+urlpatterns += [
     url(r'^register/$', register,
         reg_dict,
         name='registration_register'),
     url(r'^register/complete/$',
         DirectTemplateView.as_view(template_name='registration/registration_complete.html'),
         name='registration_complete'),
-)
+]

seahub/contacts/urls.py

@@ -1,13 +1,13 @@
 # Copyright (c) 2012-2016 Seafile Ltd.
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from views import *
 
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^$', contact_list, name='contacts'),
     url(r'^list/$', contact_list, name='contact_list'),
     url(r'^add/$', contact_add, name='contact_add'),
     url(r'^edit/$', contact_edit, name='contact_edit'),
     url(r'^delete/$', contact_delete, name='contact_delete'),
-)
+]

seahub/group/urls.py

@@ -1,11 +1,11 @@
 # Copyright (c) 2012-2016 Seafile Ltd.
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from views import group_wiki, group_wiki_create, \
     group_wiki_page_new, group_wiki_page_edit, group_wiki_pages, \
     group_wiki_page_delete, group_wiki_use_lib, group_remove
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^(?P<group_id>\d+)/wiki/$', group_wiki, name='group_wiki'),
     url(r'^(?P<group_id>\d+)/wiki/(?P<page_name>[^/]+)$', group_wiki, name='group_wiki'),
     url(r'^(?P<group_id>\d+)/wiki_pages/$', group_wiki_pages, name='group_wiki_pages'),
@@ -15,4 +15,4 @@ urlpatterns = patterns('',
     url(r'^(?P<group_id>\d+)/wiki_page_edit/(?P<page_name>[^/]+)$', group_wiki_page_edit, name='group_wiki_page_edit'),
     url(r'^(?P<group_id>\d+)/wiki_page_delete/(?P<page_name>[^/]+)$', group_wiki_page_delete, name='group_wiki_page_delete'),
     url(r'^(?P<group_id>\d+)/remove/$', group_remove, name='group_remove'),
-)
+]

seahub/help/urls.py

@@ -1,16 +1,16 @@
 # Copyright (c) 2012-2016 Seafile Ltd.
-from django.conf.urls import patterns, url, include
+from django.conf.urls import url, include
 from django.views.generic import TemplateView
 
-urlpatterns = patterns('',
-    (r'^$', TemplateView.as_view(template_name="help/install.html") ),
-    (r'^install/$', TemplateView.as_view(template_name="help/install.html") ),
-    (r'^sync_existing/$', TemplateView.as_view(template_name="help/sync_existing.html") ),
-    (r'^selective_sync/$', TemplateView.as_view(template_name="help/selective_sync.html") ),
-    (r'^unsync_resync/$', TemplateView.as_view(template_name="help/unsync_resync.html") ),
-    (r'^sync_interval/$', TemplateView.as_view(template_name="help/sync_interval.html") ),
-    (r'^desktop_proxy/$', TemplateView.as_view(template_name="help/desktop_proxy.html") ),
-    (r'^conflicts/$', TemplateView.as_view(template_name="help/conflicts.html") ),
-    (r'^ignore/$', TemplateView.as_view(template_name="help/ignore.html") ),
-    (r'^encrypted_libraries/$', TemplateView.as_view(template_name="help/encrypted_libraries.html") ),
-)
+urlpatterns = [
+    url(r'^$', TemplateView.as_view(template_name="help/install.html") ),
+    url(r'^install/$', TemplateView.as_view(template_name="help/install.html") ),
+    url(r'^sync_existing/$', TemplateView.as_view(template_name="help/sync_existing.html") ),
+    url(r'^selective_sync/$', TemplateView.as_view(template_name="help/selective_sync.html") ),
+    url(r'^unsync_resync/$', TemplateView.as_view(template_name="help/unsync_resync.html") ),
+    url(r'^sync_interval/$', TemplateView.as_view(template_name="help/sync_interval.html") ),
+    url(r'^desktop_proxy/$', TemplateView.as_view(template_name="help/desktop_proxy.html") ),
+    url(r'^conflicts/$', TemplateView.as_view(template_name="help/conflicts.html") ),
+    url(r'^ignore/$', TemplateView.as_view(template_name="help/ignore.html") ),
+    url(r'^encrypted_libraries/$', TemplateView.as_view(template_name="help/encrypted_libraries.html") ),
+]

seahub/institutions/urls.py

@@ -1,11 +1,10 @@
 # Copyright (c) 2012-2016 Seafile Ltd.
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from .views import (info, useradmin, user_info, user_remove, useradmin_search,
                     user_toggle_status, user_set_quota)
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url('^info/$', info, name="info"),
     url('^useradmin/$', useradmin, name="useradmin"),
     url(r'^useradmin/info/(?P<email>[^/]+)/$', user_info, name='user_info'),
@@ -13,4 +12,4 @@ urlpatterns = patterns(
     url('^useradmin/search/$', useradmin_search, name="useradmin_search"),
     url(r'^useradmin/set_quota/(?P<email>[^/]+)/$', user_set_quota, name='user_set_quota'),
     url(r'^useradmin/toggle_status/(?P<email>[^/]+)/$', user_toggle_status, name='user_toggle_status'),
-)
+]

seahub/invitations/urls.py

@@ -1,9 +1,8 @@
 # Copyright (c) 2012-2016 Seafile Ltd.
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from .views import token_view
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^token/(?P<token>[a-f0-9]{32})/$', token_view, name='token_view')
-)
+]

seahub/notifications/urls.py

@@ -1,16 +1,15 @@
 # Copyright (c) 2012-2016 Seafile Ltd.
-from django.conf.urls import patterns, url
+from django.conf.urls import url
+from .views import *
 
-urlpatterns = patterns('seahub.notifications.views',
+urlpatterns = [
 #    url(r'^$', 'notification_list', name='notification_list'),
-    url(r'^add/$', 'notification_add', name='notification_add'),
-    url(r'^delete/(?P<nid>[\d]+)/$', 'notification_delete', name='notification_delete'),
-    url(r'^set-primary/(?P<nid>[\d]+)/$', 'set_primary', name='set_primary'),
+    url(r'^add/$', notification_add, name='notification_add'),
+    url(r'^delete/(?P<nid>[\d]+)/$', notification_delete, name='notification_delete'),
+    url(r'^set-primary/(?P<nid>[\d]+)/$', set_primary, name='set_primary'),
 
 ########## user notifications
-    url(r'^list/$', 'user_notification_list', name='user_notification_list'),
-    url(r'^more/$', 'user_notification_more', name='user_notification_more'),
-    url(r'^remove/$', 'user_notification_remove', name='user_notification_remove'),
-)
-
-
+    url(r'^list/$', user_notification_list, name='user_notification_list'),
+    url(r'^more/$', user_notification_more, name='user_notification_more'),
+    url(r'^remove/$', user_notification_remove, name='user_notification_remove'),
+]

seahub/oauth/urls.py

@@ -1,9 +1,9 @@
 # Copyright (c) 2012-2016 Seafile Ltd.
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from seahub.oauth.views import oauth_login, oauth_callback
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'login/$', oauth_login, name='oauth_login'),
     url(r'callback/$', oauth_callback, name='oauth_callback'),
-)
+]

seahub/options/urls.py

@@ -1,9 +1,9 @@
 # Copyright (c) 2012-2016 Seafile Ltd.
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from views import *
 
-urlpatterns = patterns("",
+urlpatterns = [
     url(r'^save/$', save_options, name='options_save'),
     url(r'^enable_sub_lib/$', sub_lib_enable_set, name='sub_lib_enable_set'),
-)
+]

seahub/profile/urls.py

@@ -1,17 +1,17 @@
 # Copyright (c) 2012-2016 Seafile Ltd.
-from django.conf.urls import patterns, url, include
+from django.conf.urls import url, include
+from .views import *
 
-urlpatterns = patterns(
-    'seahub.profile.views',
+urlpatterns = [
 #    url(r'^list_user/$', 'list_userids', name="list_userids"),
-    url(r'^$', 'edit_profile', name="edit_profile"),
-    url(r'^(?P<user>[^/]+)/get/$', 'get_user_profile', name="get_user_profile"),
-    url(r'^delete/$', 'delete_user_account', name="delete_user_account"),
-    url(r'^default-repo/$', 'default_repo', name="default_repo"),
-    (r'^two_factor_authentication/', include('seahub.two_factor.urls', 'two_factor')),
-)
+    url(r'^$', edit_profile, name="edit_profile"),
+    url(r'^(?P<user>[^/]+)/get/$', get_user_profile, name="get_user_profile"),
+    url(r'^delete/$', delete_user_account, name="delete_user_account"),
+    url(r'^default-repo/$', default_repo, name="default_repo"),
+    url(r'^two_factor_authentication/', include('seahub.two_factor.urls', 'two_factor')),
+]
 
 # Move the catch-all pattern to the end.
-urlpatterns += patterns('seahub.profile.views',
-    url(r'^(?P<username>[^/]*)/$', 'user_profile', name="user_profile"),
-)
+urlpatterns += [
+    url(r'^(?P<username>[^/]*)/$', user_profile, name="user_profile"),
+]

seahub/share/urls.py

@@ -1,12 +1,12 @@
 # Copyright (c) 2012-2016 Seafile Ltd.
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from views import *
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^link/send/$', send_shared_link, name='send_shared_link'),
     url(r'^link/save/$', save_shared_link, name='save_shared_link'),
     url(r'^upload_link/send/$', send_shared_upload_link, name='send_shared_upload_link'),
     url(r'^ajax/private-share-dir/$', ajax_private_share_dir, name='ajax_private_share_dir'),
     url(r'^ajax/get-link-audit-code/$', ajax_get_link_audit_code, name='ajax_get_link_audit_code'),
-)
+]

seahub/thumbnail/urls.py

@@ -1,12 +1,12 @@
 # Copyright (c) 2012-2016 Seafile Ltd.
-from django.conf.urls import patterns, url, include
+from django.conf.urls import url, include
 
 from views import thumbnail_create, thumbnail_get, share_link_thumbnail_get, \
     share_link_thumbnail_create
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^(?P<repo_id>[-0-9a-f]{36})/create/$', thumbnail_create, name='thumbnail_create'),
     url(r'^(?P<repo_id>[-0-9a-f]{36})/(?P<size>[0-9]+)/(?P<path>.*)$', thumbnail_get, name='thumbnail_get'),
     url(r'^(?P<token>[a-f0-9]+)/create/$', share_link_thumbnail_create, name='share_link_thumbnail_create'),
     url(r'^(?P<token>[a-f0-9]+)/(?P<size>[0-9]+)/(?P<path>.*)$', share_link_thumbnail_get, name='share_link_thumbnail_get'),
-)
+]

seahub/two_factor/views/utils.py

@@ -4,7 +4,6 @@ import logging
 from constance import config
 from django.core.exceptions import ValidationError
 from django.utils.decorators import method_decorator
-from django.utils.functional import lazy_property
 from django.utils.translation import ugettext as _
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
@@ -40,7 +39,7 @@ class ExtraSessionStorage(SessionStorage):
     def _set_validated_step_data(self, validated_step_data):
         self.data[self.validated_step_data_key] = validated_step_data
 
-    validated_step_data = lazy_property(_get_validated_step_data,
+    validated_step_data = property(_get_validated_step_data,
                                    _set_validated_step_data)
 
 

seahub/urls.py

@@ -1,6 +1,6 @@
 # Copyright (c) 2012-2016 Seafile Ltd.
 from django.conf import settings
-from django.conf.urls import patterns, url, include
+from django.conf.urls import url, include
 # from django.views.generic.simple import direct_to_template
 from django.views.generic import TemplateView
 
@@ -93,27 +93,12 @@ from seahub.api2.endpoints.admin.library_history import AdminLibraryHistoryLimit
 from seahub.api2.endpoints.admin.login_bg_image import AdminLoginBgImage
 from seahub.api2.endpoints.admin.admin_role import AdminAdminRole
 
-# Uncomment the next two lines to enable the admin:
-#from django.contrib import admin
-#admin.autodiscover()
-
-urlpatterns = patterns(
-    '',
-    # Example:
-    # (r'^seahub/', include('seahub.foo.urls')),
-
-    # Uncomment the admin/doc line below and add 'django.contrib.admindocs'
-    # to INSTALLED_APPS to enable admin documentation:
-    # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
-    # Uncomment the next line to enable the admin:
-    #(r'^admin/', include(admin.site.urls)),
-
-    (r'^accounts/', include('seahub.base.registration_urls')),
-    (r'^sso/$', sso),
+urlpatterns = [
+    url(r'^accounts/', include('seahub.base.registration_urls')),
+    url(r'^sso/$', sso),
     url(r'^shib-login/', shib_login, name="shib_login"),
 
-    (r'^oauth/', include('seahub.oauth.urls')),
+    url(r'^oauth/', include('seahub.oauth.urls')),
 
     url(r'^$', libraries, name='libraries'),
     #url(r'^home/$', direct_to_template, { 'template': 'home.html' } ),
@@ -127,13 +112,10 @@ urlpatterns = patterns(
     url(r'^home/wiki_page_edit/(?P<page_name>[^/]+)$', personal_wiki_page_edit, name='personal_wiki_page_edit'),
     url(r'^home/wiki_page_delete/(?P<page_name>[^/]+)$', personal_wiki_page_delete, name='personal_wiki_page_delete'),
 
-    # url(r'^home/public/reply/(?P<msg_id>[\d]+)/$', innerpub_msg_reply, name='innerpub_msg_reply'),
-    # url(r'^home/owner/(?P<owner_name>[^/]+)/$', ownerhome, name='ownerhome'),
-
     # revert repo
     url(r'^repo/history/revert/(?P<repo_id>[-0-9a-f]{36})/$', repo_revert_history, name='repo_revert_history'),
 
-    (r'^repo/upload_check/$', validate_filename),
+    url(r'^repo/upload_check/$', validate_filename),
     url(r'^repo/download_dir/(?P<repo_id>[-0-9a-f]{36})/$', repo_download_dir, name='repo_download_dir'),
     url(r'^repo/file_revisions/(?P<repo_id>[-0-9a-f]{36})/$', file_revisions, name='file_revisions'),
     url(r'^repo/file-access/(?P<repo_id>[-0-9a-f]{36})/$', file_access, name='file_access'),
@@ -203,7 +185,7 @@ urlpatterns = patterns(
     url(r'^ajax/lib/(?P<repo_id>[-0-9a-f]{36})/dir/$', list_lib_dir, name="list_lib_dir"),
 
     ### Apps ###
-    (r'^api2/', include('seahub.api2.urls')),
+    url(r'^api2/', include('seahub.api2.urls')),
 
     ## user
     url(r'^api/v2.1/user/$', User.as_view(), name="api-v2.1-user"),
@@ -371,16 +353,16 @@ urlpatterns = patterns(
     ## admin::invitations
     url(r'^api/v2.1/admin/invitations/$', AdminInvitationsView.as_view(), name='api-v2.1-admin-invitations'),
 
-    (r'^avatar/', include('seahub.avatar.urls')),
-    (r'^notification/', include('seahub.notifications.urls')),
-    (r'^contacts/', include('seahub.contacts.urls')),
-    (r'^group/', include('seahub.group.urls')),
-    (r'^options/', include('seahub.options.urls')),
-    (r'^profile/', include('seahub.profile.urls')),
-    (r'^share/', include('seahub.share.urls')),
-    (r'^help/', include('seahub.help.urls')),
+    url(r'^avatar/', include('seahub.avatar.urls')),
+    url(r'^notification/', include('seahub.notifications.urls')),
+    url(r'^contacts/', include('seahub.contacts.urls')),
+    url(r'^group/', include('seahub.group.urls')),
+    url(r'^options/', include('seahub.options.urls')),
+    url(r'^profile/', include('seahub.profile.urls')),
+    url(r'^share/', include('seahub.share.urls')),
+    url(r'^help/', include('seahub.help.urls')),
     url(r'^captcha/', include('captcha.urls')),
-    (r'^thumbnail/', include('seahub.thumbnail.urls')),
+    url(r'^thumbnail/', include('seahub.thumbnail.urls')),
     url(r'^inst/', include('seahub.institutions.urls', app_name='institutions', namespace='institutions')),
     url(r'^invite/', include('seahub.invitations.urls', app_name='invitations', namespace='invitations')),
     url(r'^terms/', include('termsandconditions.urls')),
@@ -450,38 +432,39 @@ urlpatterns = patterns(
     url(r'^useradmin/batchadduser/example/$', batch_add_user_example, name='batch_add_user_example'),
 
     url(r'^client-login/$', client_token_login, name='client_token_login'),
-)
+]
 
 from seahub.utils import EVENTS_ENABLED
 if EVENTS_ENABLED:
-    urlpatterns += patterns(
-        '',
+    urlpatterns += [
         url(r'^sys/virus_scan_records/$', sys_virus_scan_records, name='sys_virus_scan_records'),
         url(r'^sys/virus_scan_records/delete/(?P<vid>\d+)/$', sys_delete_virus_scan_records, name='sys_delete_virus_scan_records'),
-    )
+    ]
 
 if settings.SERVE_STATIC:
+    from django.views.static import serve as static_view
     media_url = settings.MEDIA_URL.strip('/')
-    urlpatterns += patterns('',
-        (r'^%s/(?P<path>.*)$' % (media_url), 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
-    )
+    urlpatterns += [
+        url(r'^%s/(?P<path>.*)$' % (media_url), static_view,
+            {'document_root': settings.MEDIA_ROOT}),
+    ]
 
-urlpatterns += patterns(
-    '', (r'^demo/', demo),
-)
+urlpatterns += [
+    url(r'^demo/', demo),
+]
 
 from seahub.utils import HAS_FILE_SEARCH
 if HAS_FILE_SEARCH:
     from seahub_extra.search.views import search, pubuser_search
-    urlpatterns += patterns('',
+    urlpatterns += [
         url(r'^search/$', search, name='search'),
         url(r'^pubinfo/users/search/$', pubuser_search, name='pubuser_search'),
-    )
+    ]
 
 if getattr(settings, 'ENABLE_PAYMENT', False):
-    urlpatterns += patterns('',
-        (r'^pay/', include('seahub_extra.pay.urls')),
-    )
+    urlpatterns += [
+        url(r'^pay/', include('seahub_extra.pay.urls')),
+    ]
 
 
 if getattr(settings, 'ENABLE_SYSADMIN_EXTRA', False):
@@ -490,7 +473,7 @@ if getattr(settings, 'ENABLE_SYSADMIN_EXTRA', False):
         sys_login_admin_export_excel, sys_log_file_audit_export_excel, \
         sys_log_file_update_export_excel, sys_log_perm_audit_export_excel, \
         sys_log_email_audit
-    urlpatterns += patterns('',
+    urlpatterns += [
         url(r'^api/v2.1/admin/logs/login/$', LoginLogs.as_view(), name='api-v2.1-admin-logs-login'),
         url(r'^sys/loginadmin/$', sys_login_admin, name='sys_login_admin'),
         url(r'^sys/loginadmin/export-excel/$', sys_login_admin_export_excel, name='sys_login_admin_export_excel'),
@@ -507,25 +490,24 @@ if getattr(settings, 'ENABLE_SYSADMIN_EXTRA', False):
         url(r'^api/v2.1/admin/logs/perm-audit/$', PermAudit.as_view(), name='api-v2.1-admin-logs-perm-audit'),
         url(r'^sys/log/permaudit/$', sys_log_perm_audit, name='sys_log_perm_audit'),
         url(r'^sys/log/permaudit/export-excel/$', sys_log_perm_audit_export_excel, name='sys_log_perm_audit_export_excel'),
-    )
+    ]
 
 if getattr(settings, 'MULTI_TENANCY', False):
-    urlpatterns += patterns('',
-        (r'^org/', include('seahub_extra.organizations.urls')),
-    )
+    urlpatterns += [
+        url(r'^org/', include('seahub_extra.organizations.urls')),
+    ]
 
 if getattr(settings, 'ENABLE_SHIB_LOGIN', False):
-    urlpatterns += patterns(
-        '',
+    urlpatterns += [
         url(r'^shib-complete/', TemplateView.as_view(template_name='shibboleth/complete.html'), name="shib_complete"),
         url(r'^shib-success/', TemplateView.as_view(template_name="shibboleth/success.html"), name="shib_success"),
-    )
+    ]
 
 
 if getattr(settings, 'ENABLE_KRB5_LOGIN', False):
-    urlpatterns += patterns(
-        '', url(r'^krb5-login/', shib_login, name="krb5_login"),
-    )
+    urlpatterns += [
+        url(r'^krb5-login/', shib_login, name="krb5_login"),
+    ]
 
 # serve office converter static files
 from seahub.utils import HAS_OFFICE_CONVERTER, CLUSTER_MODE, OFFICE_CONVERTOR_NODE
@@ -533,40 +515,38 @@ if HAS_OFFICE_CONVERTER:
     from seahub.views.file import (
         office_convert_query_status, office_convert_get_page, office_convert_add_task
     )
-    urlpatterns += patterns('',
+    urlpatterns += [
         url(r'^office-convert/static/(?P<repo_id>[-0-9a-f]{36})/(?P<commit_id>[0-9a-f]{40})/(?P<path>.+)/(?P<filename>[^/].+)$',
             office_convert_get_page,
             name='office_convert_get_page'),
         url(r'^office-convert/status/$', office_convert_query_status, name='office_convert_query_status'),
-    )
+    ]
 
     if CLUSTER_MODE and OFFICE_CONVERTOR_NODE:
-        urlpatterns += patterns('',
+        urlpatterns += [
             url(r'^office-convert/internal/add-task/$', office_convert_add_task),
             url(r'^office-convert/internal/status/$', office_convert_query_status, {'cluster_internal': True}),
             url(r'^office-convert/internal/static/(?P<repo_id>[-0-9a-f]{36})/(?P<commit_id>[0-9a-f]{40})/(?P<path>.+)/(?P<filename>[^/].+)$',
                 office_convert_get_page, {'cluster_internal': True}),
-        )
+        ]
 
 if TRAFFIC_STATS_ENABLED:
     from seahub.views.sysadmin import sys_traffic_admin
-    urlpatterns += patterns('',
+    urlpatterns += [
         url(r'^sys/trafficadmin/$', sys_traffic_admin, name='sys_trafficadmin'),
-    )
+    ]
 
 if getattr(settings, 'ENABLE_ADFS_LOGIN', False):
     from seahub_extra.adfs_auth.views import assertion_consumer_service, \
         auth_complete
-    urlpatterns += patterns(
-        '',
+    urlpatterns += [
         url(r'^saml2/acs/$', assertion_consumer_service, name='saml2_acs'),
         url(r'^saml2/complete/$', auth_complete, name='saml2_complete'),
         (r'^saml2/', include('djangosaml2.urls')),
-    )
+    ]
 
 if getattr(settings, 'ENABLE_ONLYOFFICE', False):
     from seahub.onlyoffice.views import onlyoffice_editor_callback
-    urlpatterns += patterns(
-        '',
+    urlpatterns += [
         url(r'^onlyoffice/editor-callback/$', onlyoffice_editor_callback, name='onlyoffice_editor_callback'),
-    )
+    ]

seahub/utils/rooturl.py

@@ -26,7 +26,7 @@
 
 
 from django.conf import settings
-from django.conf.urls import patterns, include
+from django.conf.urls import include, url
 from django.core.exceptions import ImproperlyConfigured
 
 
@@ -37,6 +37,6 @@ if hasattr(settings, "SITE_ROOT"):
         raise ImproperlyConfigured("SITE_ROOT_URLCONF must be set when "
                                    "using SITE_ROOT")
 
-    urlpatterns = patterns('',
-        (r'^%s' % settings.SITE_ROOT[1:], include(settings.SITE_ROOT_URLCONF)),
-    )
+    urlpatterns = [
+        url(r'^%s' % settings.SITE_ROOT[1:], include(settings.SITE_ROOT_URLCONF)),
+    ]

seahub/wopi/urls.py

@@ -1,10 +1,10 @@
 # Copyright (c) 2012-2016 Seafile Ltd.
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from views import WOPIFilesView, WOPIFilesContentsView
 
-urlpatterns = patterns('',
+urlpatterns = [
     # RESTful API
     url(r'^files/(?P<file_id>[-0-9-a-f]{40})$', WOPIFilesView.as_view(), name='WOPIFilesView'),
     url(r'^files/(?P<file_id>[-0-9-a-f]{40})/contents$', WOPIFilesContentsView.as_view(), name='WOPIFilesContentsView'),
-)
+]

thirdpart/captcha/tests/urls.py

@@ -1,14 +1,13 @@
 try:
-    from django.conf.urls import url, patterns, include
+    from django.conf.urls import url, include
 except ImportError:
-    from django.conf.urls.defaults import url, patterns, include
+    from django.conf.urls.defaults import url, include
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'test/$', 'captcha.tests.views.test', name='captcha-test'),
     url(r'test-modelform/$', 'captcha.tests.views.test_model_form', name='captcha-test-model-form'),
     url(r'test2/$', 'captcha.tests.views.test_custom_error_message', name='captcha-test-custom-error-message'),
     url(r'test3/$', 'captcha.tests.views.test_per_form_format', name='test_per_form_format'),
     url(r'test-non-required/$', 'captcha.tests.views.test_non_required', name='captcha-test-non-required'),
     url(r'', include('captcha.urls')),
-)
+]

thirdpart/captcha/urls.py

@@ -1,12 +1,13 @@
 try:
-    from django.conf.urls import patterns, url
+    from django.conf.urls import url
 except ImportError:
-    from django.conf.urls.defaults import patterns, url
+    from django.conf.urls.defaults import url
 
-urlpatterns = patterns(
-    'captcha.views',
-    url(r'image/(?P<key>\w+)/$', 'captcha_image', name='captcha-image', kwargs={'scale': 1}),
-    url(r'image/(?P<key>\w+)@2/$', 'captcha_image', name='captcha-image-2x', kwargs={'scale': 2}),
-    url(r'audio/(?P<key>\w+)/$', 'captcha_audio', name='captcha-audio'),
-    url(r'refresh/$', 'captcha_refresh', name='captcha-refresh'),
-)
+from .views import *
+
+urlpatterns = [
+    url(r'image/(?P<key>\w+)/$', captcha_image, name='captcha-image', kwargs={'scale': 1}),
+    url(r'image/(?P<key>\w+)@2/$', captcha_image, name='captcha-image-2x', kwargs={'scale': 2}),
+    url(r'audio/(?P<key>\w+)/$', captcha_audio, name='captcha-audio'),
+    url(r'refresh/$', captcha_refresh, name='captcha-refresh'),
+]

thirdpart/registration/auth_urls.py

@@ -24,12 +24,12 @@ consult a specific backend's documentation for details.
 """
 
 from django.conf import settings
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from seahub.auth import views as auth_views
 from seahub.two_factor.views.login import TwoFactorVerifyView
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^password/change/$',
         auth_views.password_change,
         name='auth_password_change'),
@@ -52,21 +52,21 @@ urlpatterns = patterns('',
     url(r'^login/two-factor-auth/$',
         TwoFactorVerifyView.as_view(),
         name='two_factor_auth'),
-)
+]
 
 if getattr(settings, 'ENABLE_LOGIN_SIMPLE_CHECK', False):
-    urlpatterns += patterns('',
-                            (r'^login/simple_check/$',
+    urlpatterns += [
+        url(r'^login/simple_check/$',
             auth_views.login_simple_check),
-                            )
+    ]
 
 if getattr(settings, 'ENABLE_SSO', False):
-    urlpatterns += patterns('',
+    urlpatterns += [
         url(r'^login/$', 'django_cas.views.login'),
         url(r'^logout/$', 'django_cas.views.logout'),
-                            )
+    ]
 else:
-    urlpatterns += patterns('',
+    urlpatterns += [
         url(r'^login/$',
             auth_views.login,
             {'template_name': 'registration/login.html',
@@ -77,4 +77,4 @@ else:
             {'template_name': 'registration/logout.html',
              'next_page': settings.LOGOUT_REDIRECT_URL},
             name='auth_logout'),
-                            )
+    ]

thirdpart/registration/backends/default/urls.py

@@ -18,14 +18,14 @@ up your own URL patterns for these views instead.
 """
 
 
-from django.conf.urls.defaults import *
+from django.conf.urls import url, include
 from django.views.generic.simple import direct_to_template
 
 from registration.views import activate
 from registration.views import register
 
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^activate/complete/$',
         direct_to_template,
         { 'template': 'registration/activation_complete.html' },
@@ -50,5 +50,5 @@ urlpatterns = patterns('',
         direct_to_template,
         { 'template': 'registration/registration_closed.html' },
         name='registration_disallowed'),
-                       (r'', include('registration.auth_urls')),
-                       )
+    url(r'', include('registration.auth_urls')),
+]

thirdpart/shibboleth/urls.py

@@ -3,12 +3,12 @@ import django
 if StrictVersion(django.get_version()) < StrictVersion('1.4'):
     from django.conf.urls.defaults import *
 else:
-    from django.conf.urls import patterns, url
+    from django.conf.urls import url
 
 from views import ShibbolethView, ShibbolethLogoutView, ShibbolethLoginView
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^login/$', ShibbolethLoginView.as_view(), name='login'),
     url(r'^logout/$', ShibbolethLogoutView.as_view(), name='logout'),
     url(r'^$', ShibbolethView.as_view(), name='info'),
-)
+]

thirdpart/termsandconditions/urls.py

@@ -6,12 +6,9 @@
 # pylint: disable=W0401, W0614, E1120
 
 from django.conf.urls import url
-from django.contrib import admin
 from .views import TermsView, AcceptTermsView, EmailTermsView
 from .models import DEFAULT_TERMS_SLUG
 
-admin.autodiscover()
-
 urlpatterns = (
     # # View Default Terms
     # url(r'^$', TermsView.as_view(), {"slug": DEFAULT_TERMS_SLUG}, name="tc_view_page"),