From 3b739367234811e160640b8cc88730892442a513 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 26 Jun 2014 15:27:03 -0400 Subject: [PATCH] Update patterns, url imports in all of the project's urls.py files --- mayan/apps/acls/urls.py | 2 +- mayan/apps/bootstrap/urls.py | 2 +- mayan/apps/checkouts/urls.py | 2 +- mayan/apps/common/urls.py | 5 +++-- mayan/apps/converter/urls.py | 2 +- mayan/apps/django_gpg/urls.py | 2 +- mayan/apps/document_acls/urls.py | 2 +- mayan/apps/document_comments/urls.py | 2 +- mayan/apps/document_indexing/urls.py | 2 +- mayan/apps/document_signatures/urls.py | 2 +- mayan/apps/documents/urls.py | 2 +- mayan/apps/dynamic_search/urls.py | 2 +- mayan/apps/folders/urls.py | 2 +- mayan/apps/history/urls.py | 2 +- mayan/apps/installation/urls.py | 2 +- mayan/apps/linking/urls.py | 2 +- mayan/apps/main/urls.py | 2 +- mayan/apps/metadata/urls.py | 2 +- mayan/apps/ocr/urls.py | 2 +- mayan/apps/permissions/urls.py | 2 +- mayan/apps/project_setup/urls.py | 2 +- mayan/apps/project_tools/urls.py | 2 +- mayan/apps/registration/urls.py | 2 +- mayan/apps/rest_api/urls.py | 2 +- mayan/apps/scheduler/urls.py | 2 +- mayan/apps/smart_settings/urls.py | 2 +- mayan/apps/tags/urls.py | 2 +- mayan/apps/user_management/urls.py | 2 +- mayan/urls.py | 4 ++-- 29 files changed, 32 insertions(+), 31 deletions(-) diff --git a/mayan/apps/acls/urls.py b/mayan/apps/acls/urls.py index ba9aa8be92..572eb5fe80 100644 --- a/mayan/apps/acls/urls.py +++ b/mayan/apps/acls/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('acls.views', url(r'^new_holder_for/(?P[-\w]+)/(?P[-\w]+)/(?P\d+)/$', 'acl_new_holder_for', (), 'acl_new_holder_for'), diff --git a/mayan/apps/bootstrap/urls.py b/mayan/apps/bootstrap/urls.py index 1ad28beebf..c301667001 100644 --- a/mayan/apps/bootstrap/urls.py +++ b/mayan/apps/bootstrap/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('bootstrap.views', url(r'^setup/list/$', 'bootstrap_setup_list', (), 'bootstrap_setup_list'), diff --git a/mayan/apps/checkouts/urls.py b/mayan/apps/checkouts/urls.py index 6dd1d8fdd8..d82a26ee0a 100644 --- a/mayan/apps/checkouts/urls.py +++ b/mayan/apps/checkouts/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('checkouts.views', url(r'^list/$', 'checkout_list', (), 'checkout_list'), diff --git a/mayan/apps/common/urls.py b/mayan/apps/common/urls.py index ce9503454d..0b385a6a30 100644 --- a/mayan/apps/common/urls.py +++ b/mayan/apps/common/urls.py @@ -1,6 +1,7 @@ -from django.conf.urls.defaults import patterns, url -from common.backport.generic.simple import direct_to_template from django.conf import settings +from django.conf.urls import patterns, url + +from common.backport.generic.simple import direct_to_template urlpatterns = patterns('common.views', url(r'^about/$', direct_to_template, {'template': 'about.html'}, 'about_view'), diff --git a/mayan/apps/converter/urls.py b/mayan/apps/converter/urls.py index 5641b27c83..2053fbdc23 100644 --- a/mayan/apps/converter/urls.py +++ b/mayan/apps/converter/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('converter.views', url(r'^formats/$', 'formats_list', (), 'formats_list'), diff --git a/mayan/apps/django_gpg/urls.py b/mayan/apps/django_gpg/urls.py index 04ef8af89c..bdeb7a9c51 100644 --- a/mayan/apps/django_gpg/urls.py +++ b/mayan/apps/django_gpg/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('django_gpg.views', url(r'^delete/(?P.+)/(?P\w+)/$', 'key_delete', (), 'key_delete'), diff --git a/mayan/apps/document_acls/urls.py b/mayan/apps/document_acls/urls.py index 50a6e79aa6..6632eef295 100644 --- a/mayan/apps/document_acls/urls.py +++ b/mayan/apps/document_acls/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('document_acls.views', url(r'^list_for/document/(?P\d+)/$', 'document_acl_list', (), 'document_acl_list'), diff --git a/mayan/apps/document_comments/urls.py b/mayan/apps/document_comments/urls.py index d9230c22d5..39e7fb9b31 100644 --- a/mayan/apps/document_comments/urls.py +++ b/mayan/apps/document_comments/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('document_comments.views', url(r'^comment/(?P\d+)/delete/$', 'comment_delete', (), 'comment_delete'), diff --git a/mayan/apps/document_indexing/urls.py b/mayan/apps/document_indexing/urls.py index 7c6799948d..d4f9847553 100644 --- a/mayan/apps/document_indexing/urls.py +++ b/mayan/apps/document_indexing/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('document_indexing.views', url(r'^setup/index/list/$', 'index_setup_list', (), 'index_setup_list'), diff --git a/mayan/apps/document_signatures/urls.py b/mayan/apps/document_signatures/urls.py index 1303ad2108..c227cd1490 100644 --- a/mayan/apps/document_signatures/urls.py +++ b/mayan/apps/document_signatures/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('document_signatures.views', url(r'^verify/(?P\d+)/$', 'document_verify', (), 'document_verify'), diff --git a/mayan/apps/documents/urls.py b/mayan/apps/documents/urls.py index e70bba4bfb..185f1016c0 100644 --- a/mayan/apps/documents/urls.py +++ b/mayan/apps/documents/urls.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url from .conf.settings import (PREVIEW_SIZE, PRINT_SIZE, THUMBNAIL_SIZE, DISPLAY_SIZE, MULTIPAGE_PREVIEW_SIZE) diff --git a/mayan/apps/dynamic_search/urls.py b/mayan/apps/dynamic_search/urls.py index 8069a50342..37d2206f47 100644 --- a/mayan/apps/dynamic_search/urls.py +++ b/mayan/apps/dynamic_search/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('dynamic_search.views', url(r'^$', 'search', (), 'search'), diff --git a/mayan/apps/folders/urls.py b/mayan/apps/folders/urls.py index a3f2a4c0d2..1fcd128534 100644 --- a/mayan/apps/folders/urls.py +++ b/mayan/apps/folders/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('folders.views', url(r'^list/$', 'folder_list', (), 'folder_list'), diff --git a/mayan/apps/history/urls.py b/mayan/apps/history/urls.py index 9c2b4b9778..7dd85a29fb 100644 --- a/mayan/apps/history/urls.py +++ b/mayan/apps/history/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('history.views', url(r'^list/$', 'history_list', (), 'history_list'), diff --git a/mayan/apps/installation/urls.py b/mayan/apps/installation/urls.py index 785df3f424..f321b5f583 100644 --- a/mayan/apps/installation/urls.py +++ b/mayan/apps/installation/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('installation.views', url(r'^$', 'namespace_list', (), 'namespace_list'), diff --git a/mayan/apps/linking/urls.py b/mayan/apps/linking/urls.py index 7cb2749d6e..d1b367deb0 100644 --- a/mayan/apps/linking/urls.py +++ b/mayan/apps/linking/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('linking.views', url(r'^action/$', 'smart_link_action', (), 'smart_link_action'), diff --git a/mayan/apps/main/urls.py b/mayan/apps/main/urls.py index 7ee8ceca8d..215015be1a 100644 --- a/mayan/apps/main/urls.py +++ b/mayan/apps/main/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('main.views', url(r'^$', 'home', (), 'home'), diff --git a/mayan/apps/metadata/urls.py b/mayan/apps/metadata/urls.py index 3a50bdf2dc..f3f7557e2f 100644 --- a/mayan/apps/metadata/urls.py +++ b/mayan/apps/metadata/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('metadata.views', url(r'^(?P\d+)/edit/$', 'metadata_edit', (), 'metadata_edit'), diff --git a/mayan/apps/ocr/urls.py b/mayan/apps/ocr/urls.py index 5c15891dfb..264cd8374d 100644 --- a/mayan/apps/ocr/urls.py +++ b/mayan/apps/ocr/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('ocr.views', url(r'^document/(?P\d+)/submit/$', 'submit_document', (), 'submit_document'), diff --git a/mayan/apps/permissions/urls.py b/mayan/apps/permissions/urls.py index a052f1471b..f6a89af9ba 100644 --- a/mayan/apps/permissions/urls.py +++ b/mayan/apps/permissions/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('permissions.views', url(r'^role/list/$', 'role_list', (), 'role_list'), diff --git a/mayan/apps/project_setup/urls.py b/mayan/apps/project_setup/urls.py index c78f55eaab..ae6e5c6909 100644 --- a/mayan/apps/project_setup/urls.py +++ b/mayan/apps/project_setup/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('project_setup.views', url(r'^list/$', 'setup_list', (), 'setup_list'), diff --git a/mayan/apps/project_tools/urls.py b/mayan/apps/project_tools/urls.py index f2ea9accf9..c6156b0714 100644 --- a/mayan/apps/project_tools/urls.py +++ b/mayan/apps/project_tools/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('project_tools.views', url(r'^list/$', 'tools_list', (), 'tools_list'), diff --git a/mayan/apps/registration/urls.py b/mayan/apps/registration/urls.py index 6e7db863af..adcfd72a59 100644 --- a/mayan/apps/registration/urls.py +++ b/mayan/apps/registration/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('registration.views', url(r'^form/$', 'form_view', (), 'form_view'), diff --git a/mayan/apps/rest_api/urls.py b/mayan/apps/rest_api/urls.py index d2a80ebaf7..ce4f16cbac 100644 --- a/mayan/apps/rest_api/urls.py +++ b/mayan/apps/rest_api/urls.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url from .views import APIBase, Version_1, DocumentDetailView, IsZoomable diff --git a/mayan/apps/scheduler/urls.py b/mayan/apps/scheduler/urls.py index fde9602994..71c377f4d0 100644 --- a/mayan/apps/scheduler/urls.py +++ b/mayan/apps/scheduler/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('scheduler.views', url(r'^list/$', 'job_list', (), 'job_list'), diff --git a/mayan/apps/smart_settings/urls.py b/mayan/apps/smart_settings/urls.py index 4ba642d50a..014aa679b4 100644 --- a/mayan/apps/smart_settings/urls.py +++ b/mayan/apps/smart_settings/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('smart_settings.views', url(r'^list/$', 'setting_list', (), 'setting_list'), diff --git a/mayan/apps/tags/urls.py b/mayan/apps/tags/urls.py index 7c033ac021..ceb319af6b 100644 --- a/mayan/apps/tags/urls.py +++ b/mayan/apps/tags/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('tags.views', url(r'^list/$', 'tag_list', (), 'tag_list'), diff --git a/mayan/apps/user_management/urls.py b/mayan/apps/user_management/urls.py index fceaea2b4e..dc2fbcd9f9 100644 --- a/mayan/apps/user_management/urls.py +++ b/mayan/apps/user_management/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns, url +from django.conf.urls import patterns, url urlpatterns = patterns('user_management.views', url(r'^user/list/$', 'user_list', (), 'user_list'), diff --git a/mayan/urls.py b/mayan/urls.py index b880381f08..8f33a95c3c 100644 --- a/mayan/urls.py +++ b/mayan/urls.py @@ -1,6 +1,6 @@ -from django.conf.urls.defaults import patterns, include, url -from django.contrib import admin from django.conf import settings +from django.conf.urls import include, patterns, url +from django.contrib import admin admin.autodiscover()