From 6e76248aed9bd1d374715ee6aa0725dc491bb71a Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sun, 18 May 2014 03:48:57 -0400 Subject: [PATCH] Reorganize imports, update multiline import style --- apps/documents/__init__.py | 20 ++++++++-------- apps/documents/views.py | 47 +++++++++++++++++++------------------- 2 files changed, 34 insertions(+), 33 deletions(-) diff --git a/apps/documents/__init__.py b/apps/documents/__init__.py index cd0cb9ca70..4c7723117e 100644 --- a/apps/documents/__init__.py +++ b/apps/documents/__init__.py @@ -4,17 +4,22 @@ import tempfile from django.utils.translation import ugettext_lazy as _ +from acls.api import class_permissions from common.utils import validate_path, encapsulate +from dynamic_search.classes import SearchModel +from history.api import register_history_type +from history.permissions import PERMISSION_HISTORY_VIEW +from main.api import register_diagnostic, register_maintenance_links from navigation.api import (register_links, register_top_menu, register_model_list_columns, register_multi_item_links, register_sidebar_template) -from main.api import register_diagnostic, register_maintenance_links -from history.api import register_history_type -from history.permissions import PERMISSION_HISTORY_VIEW from project_setup.api import register_setup -from acls.api import class_permissions -from dynamic_search.classes import SearchModel +from .conf.settings import ZOOM_MAX_LEVEL +from .conf.settings import ZOOM_MIN_LEVEL +from .conf import settings as document_settings +from .events import (HISTORY_DOCUMENT_CREATED, + HISTORY_DOCUMENT_EDITED, HISTORY_DOCUMENT_DELETED) from .models import (Document, DocumentPage, DocumentPageTransformation, DocumentType, DocumentTypeFilename, DocumentVersion) @@ -26,11 +31,6 @@ from .permissions import (PERMISSION_DOCUMENT_CREATE, PERMISSION_DOCUMENT_TYPE_EDIT, PERMISSION_DOCUMENT_TYPE_DELETE, PERMISSION_DOCUMENT_TYPE_CREATE, PERMISSION_DOCUMENT_TYPE_VIEW, PERMISSION_DOCUMENT_NEW_VERSION) -from .events import (HISTORY_DOCUMENT_CREATED, - HISTORY_DOCUMENT_EDITED, HISTORY_DOCUMENT_DELETED) -from .conf.settings import ZOOM_MAX_LEVEL -from .conf.settings import ZOOM_MIN_LEVEL -from .conf import settings as document_settings from .widgets import document_thumbnail # Document page links expressions diff --git a/apps/documents/views.py b/apps/documents/views.py index a323dc5229..aac64e6eda 100644 --- a/apps/documents/views.py +++ b/apps/documents/views.py @@ -16,36 +16,30 @@ from django.core.exceptions import PermissionDenied from django.conf import settings import sendfile -from common.utils import pretty_size, parse_range, urlquote, \ - return_diff, encapsulate + +from acls.models import AccessEntry +from common.compressed_files import CompressedFile +from common.utils import (pretty_size, parse_range, urlquote, + return_diff, encapsulate) +from common.literals import (PAGE_SIZE_DIMENSIONS, + PAGE_ORIENTATION_PORTRAIT, PAGE_ORIENTATION_LANDSCAPE) from common.widgets import two_state_template -from common.literals import PAGE_SIZE_DIMENSIONS, \ - PAGE_ORIENTATION_PORTRAIT, PAGE_ORIENTATION_LANDSCAPE from common.conf.settings import DEFAULT_PAPER_SIZE -from converter.literals import DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION, \ - DEFAULT_PAGE_NUMBER, DEFAULT_FILE_FORMAT_MIMETYPE +from converter.literals import (DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION, + DEFAULT_PAGE_NUMBER, DEFAULT_FILE_FORMAT_MIMETYPE) from converter.office_converter import OfficeConverter +from document_indexing.api import update_indexes, delete_indexes from filetransfers.api import serve_file +from history.api import create_history from metadata.forms import MetadataFormSet, MetadataSelectionForm from navigation.utils import resolve_to_name from permissions.models import Permission -from document_indexing.api import update_indexes, delete_indexes -from history.api import create_history -from acls.models import AccessEntry -from common.compressed_files import CompressedFile +from .events import (HISTORY_DOCUMENT_CREATED, + HISTORY_DOCUMENT_EDITED, HISTORY_DOCUMENT_DELETED) from .conf.settings import (PREVIEW_SIZE, STORAGE_BACKEND, ZOOM_PERCENT_STEP, ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL, ROTATION_STEP, PRINT_SIZE, RECENT_COUNT) -from .permissions import (PERMISSION_DOCUMENT_CREATE, - PERMISSION_DOCUMENT_PROPERTIES_EDIT, PERMISSION_DOCUMENT_VIEW, - PERMISSION_DOCUMENT_DELETE, PERMISSION_DOCUMENT_DOWNLOAD, - PERMISSION_DOCUMENT_TRANSFORM, PERMISSION_DOCUMENT_TOOLS, - PERMISSION_DOCUMENT_EDIT, PERMISSION_DOCUMENT_VERSION_REVERT, - PERMISSION_DOCUMENT_TYPE_EDIT, PERMISSION_DOCUMENT_TYPE_DELETE, - PERMISSION_DOCUMENT_TYPE_CREATE, PERMISSION_DOCUMENT_TYPE_VIEW) -from .events import (HISTORY_DOCUMENT_CREATED, - HISTORY_DOCUMENT_EDITED, HISTORY_DOCUMENT_DELETED) from .forms import (DocumentTypeSelectForm, DocumentForm_edit, DocumentPropertiesForm, DocumentPreviewForm, DocumentPageForm, @@ -53,10 +47,17 @@ from .forms import (DocumentTypeSelectForm, DocumentPageForm_edit, DocumentPageForm_text, PrintForm, DocumentTypeForm, DocumentTypeFilenameForm, DocumentTypeFilenameForm_create, DocumentDownloadForm) -from .wizards import DocumentCreateWizard from .models import (Document, DocumentType, DocumentPage, DocumentPageTransformation, RecentDocument, DocumentTypeFilename, DocumentVersion) +from .permissions import (PERMISSION_DOCUMENT_CREATE, + PERMISSION_DOCUMENT_PROPERTIES_EDIT, PERMISSION_DOCUMENT_VIEW, + PERMISSION_DOCUMENT_DELETE, PERMISSION_DOCUMENT_DOWNLOAD, + PERMISSION_DOCUMENT_TRANSFORM, PERMISSION_DOCUMENT_TOOLS, + PERMISSION_DOCUMENT_EDIT, PERMISSION_DOCUMENT_VERSION_REVERT, + PERMISSION_DOCUMENT_TYPE_EDIT, PERMISSION_DOCUMENT_TYPE_DELETE, + PERMISSION_DOCUMENT_TYPE_CREATE, PERMISSION_DOCUMENT_TYPE_VIEW) +from .wizards import DocumentCreateWizard logger = logging.getLogger(__name__) @@ -397,8 +398,8 @@ def document_download(request, document_id=None, document_id_list=None, document raise else: messages.error(request, e) - return HttpResponseRedirect(request.META['HTTP_REFERER']) - + return HttpResponseRedirect(request.META['HTTP_REFERER']) + else: form = DocumentDownloadForm(document_versions=document_versions) @@ -1294,7 +1295,7 @@ def document_type_filename_create(request, document_type_id): 'document_type': document_type, 'navigation_object_list': [ {'object': 'document_type', 'name': _(u'document type')}, - ], + ], }, context_instance=RequestContext(request))