diff --git a/mayan/apps/document_parsing/apps.py b/mayan/apps/document_parsing/apps.py index 1f3683c3d7..02c92ba682 100644 --- a/mayan/apps/document_parsing/apps.py +++ b/mayan/apps/document_parsing/apps.py @@ -12,8 +12,7 @@ from mayan.apps.acls.classes import ModelPermission from mayan.apps.common.apps import MayanAppConfig from mayan.apps.common.classes import ModelField from mayan.apps.common.menus import ( - menu_facet, menu_list_facet, menu_multi_item, menu_object, menu_secondary, - menu_tools + menu_facet, menu_list_facet, menu_multi_item, menu_secondary, menu_tools ) from mayan.apps.documents.search import document_search, document_page_search from mayan.apps.documents.signals import post_version_upload diff --git a/mayan/apps/document_parsing/forms.py b/mayan/apps/document_parsing/forms.py index 786dc3dddf..5c4d6af26d 100644 --- a/mayan/apps/document_parsing/forms.py +++ b/mayan/apps/document_parsing/forms.py @@ -6,12 +6,9 @@ from django.utils.html import conditional_escape from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _, ugettext -from mayan.apps.acls.models import AccessControlList from mayan.apps.common.widgets import TextAreaDiv -from mayan.apps.documents.models import DocumentType from .models import DocumentPageContent -from .permissions import permission_parse_document class DocumentContentForm(forms.Form): diff --git a/mayan/apps/document_parsing/links.py b/mayan/apps/document_parsing/links.py index ac1736eca6..30fd5016f6 100644 --- a/mayan/apps/document_parsing/links.py +++ b/mayan/apps/document_parsing/links.py @@ -4,11 +4,6 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.navigation import Link, get_cascade_condition -from .icons import ( - icon_document_content, icon_document_parsing_errors_list, - icon_document_content_download, icon_document_type_parsing_settings, - icon_document_type_submit, icon_link_error_list -) from .permissions import ( permission_content_view, permission_document_type_parsing_setup, permission_parse_document diff --git a/mayan/apps/document_parsing/views.py b/mayan/apps/document_parsing/views.py index f85a1d2403..a81811df81 100644 --- a/mayan/apps/document_parsing/views.py +++ b/mayan/apps/document_parsing/views.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.contrib import messages from django.http import HttpResponseRedirect from django.shortcuts import get_object_or_404 -from django.urls import reverse, reverse_lazy +from django.urls import reverse_lazy from django.utils.translation import ugettext_lazy as _, ungettext from mayan.apps.common.generics import ( diff --git a/mayan/apps/document_states/migrations/0013_auto_20190423_0810.py b/mayan/apps/document_states/migrations/0013_auto_20190423_0810.py index b1bbea5ab5..da922b9b83 100644 --- a/mayan/apps/document_states/migrations/0013_auto_20190423_0810.py +++ b/mayan/apps/document_states/migrations/0013_auto_20190423_0810.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals from django.db import migrations - def operation_add_full_path(apps, schema_editor): WorkflowStateAction = apps.get_model('document_states', 'WorkflowStateAction') @@ -16,7 +15,7 @@ def operation_remove_full_path(apps, schema_editor): WorkflowStateAction = apps.get_model('document_states', 'WorkflowStateAction') for workflow_state_action in WorkflowStateAction.objects.using(schema_editor.connection.alias).all(): - workflow_state_action.action_path = workflow_state_action.action_path.replace('mayan.apps.','') + workflow_state_action.action_path = workflow_state_action.action_path.replace('mayan.apps.', '') workflow_state_action.save() diff --git a/mayan/apps/documents/forms/document_type_forms.py b/mayan/apps/documents/forms/document_type_forms.py index e3ebdcc499..dbcc26b2da 100644 --- a/mayan/apps/documents/forms/document_type_forms.py +++ b/mayan/apps/documents/forms/document_type_forms.py @@ -6,7 +6,6 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.acls.models import AccessControlList from ..models import DocumentType, DocumentTypeFilename -from ..permissions import permission_document_create __all__ = ('DocumentTypeFilteredSelectForm', 'DocumentTypeFilenameForm_create') diff --git a/mayan/apps/documents/links.py b/mayan/apps/documents/links.py index d6570919fd..db230dfde1 100644 --- a/mayan/apps/documents/links.py +++ b/mayan/apps/documents/links.py @@ -10,7 +10,6 @@ from mayan.apps.navigation import Link from .icons import ( icon_clear_image_cache, - icon_duplicated_document_list, icon_document_list_recent_access, icon_recent_added_document_list, icon_document_page_navigation_first, @@ -22,7 +21,6 @@ from .icons import ( icon_document_page_rotate_right, icon_document_page_zoom_in, icon_document_page_zoom_out, - icon_document_pages, icon_document_type_create, icon_document_type_delete, diff --git a/mayan/apps/navigation/classes.py b/mayan/apps/navigation/classes.py index 6c230bef18..3e16c142f5 100644 --- a/mayan/apps/navigation/classes.py +++ b/mayan/apps/navigation/classes.py @@ -7,7 +7,7 @@ from furl import furl from django.apps import apps from django.contrib.admin.utils import label_for_field -from django.core.exceptions import PermissionDenied +from django.core.exceptions import ImproperlyConfigured, PermissionDenied from django.template import VariableDoesNotExist, Variable from django.template.defaulttags import URLNode from django.urls import resolve, reverse @@ -15,7 +15,7 @@ from django.utils.encoding import force_str, force_text from django.utils.module_loading import import_string from mayan.apps.common.settings import setting_home_view -from mayan.apps.common.utils import resolve_attribute, return_attrib +from mayan.apps.common.utils import resolve_attribute from mayan.apps.permissions import Permission from .utils import get_current_view_name diff --git a/mayan/apps/ocr/apps.py b/mayan/apps/ocr/apps.py index b513cb47ca..98316e85eb 100644 --- a/mayan/apps/ocr/apps.py +++ b/mayan/apps/ocr/apps.py @@ -12,8 +12,7 @@ from mayan.apps.acls.classes import ModelPermission from mayan.apps.common.apps import MayanAppConfig from mayan.apps.common.classes import ModelField from mayan.apps.common.menus import ( - menu_facet, menu_list_facet, menu_multi_item, menu_object, menu_secondary, - menu_tools + menu_facet, menu_list_facet, menu_multi_item, menu_secondary, menu_tools ) from mayan.apps.documents.search import document_search, document_page_search from mayan.apps.documents.signals import post_version_upload diff --git a/mayan/apps/ocr/forms.py b/mayan/apps/ocr/forms.py index 5c59108e29..6951861ecf 100644 --- a/mayan/apps/ocr/forms.py +++ b/mayan/apps/ocr/forms.py @@ -7,7 +7,6 @@ from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _, ugettext from mayan.apps.common.widgets import TextAreaDiv -from mayan.apps.documents.models import DocumentType from .models import DocumentPageOCRContent diff --git a/mayan/apps/tags/apps.py b/mayan/apps/tags/apps.py index 613bea2665..591a1ebad1 100644 --- a/mayan/apps/tags/apps.py +++ b/mayan/apps/tags/apps.py @@ -11,7 +11,7 @@ from mayan.apps.common.apps import MayanAppConfig from mayan.apps.common.classes import ModelField from mayan.apps.common.menus import ( menu_facet, menu_list_facet, menu_main, menu_multi_item, menu_object, - menu_sidebar, menu_secondary + menu_secondary ) from mayan.apps.documents.search import document_page_search, document_search from mayan.apps.events import ModelEventType diff --git a/mayan/apps/tags/icons.py b/mayan/apps/tags/icons.py index f247d83413..df4feeca2d 100644 --- a/mayan/apps/tags/icons.py +++ b/mayan/apps/tags/icons.py @@ -36,6 +36,3 @@ icon_tag_delete_submit = Icon(driver_name='fontawesome', symbol='times') icon_tag_edit = Icon(driver_name='fontawesome', symbol='pen') icon_tag_document_list = icon_document_list icon_tag_list = Icon(driver_name='fontawesome', symbol='tag') - - -