Import cleanups, reorganization, PEP8 cleanups

mayan/apps/sources/admin.py

@@ -2,8 +2,8 @@ from __future__ import absolute_import
 
 from django.contrib import admin
 
-from .models import StagingFolder, WebForm, SourceTransformation
+from .models import StagingFolder, SourceTransformation, WebForm
 
 admin.site.register(StagingFolder)
-admin.site.register(WebForm)
 admin.site.register(SourceTransformation)
+admin.site.register(WebForm)

mayan/apps/sources/forms.py

@@ -3,15 +3,14 @@ from __future__ import absolute_import
 import logging
 
 from django import forms
-from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext
+from django.utils.translation import ugettext_lazy as _
 
 from documents.forms import DocumentForm
 
-from .models import (WebForm, StagingFolder, SourceTransformation,
-    WatchFolder)
-from .widgets import FamFamRadioSelect
+from .models import SourceTransformation, StagingFolder, WebForm, WatchFolder
 from .utils import validate_whitelist_blacklist
+from .widgets import FamFamRadioSelect
 
 logger = logging.getLogger(__name__)
 

mayan/apps/sources/links.py

@@ -2,13 +2,14 @@ from __future__ import absolute_import
 
 from django.utils.translation import ugettext_lazy as _
 
-from documents.permissions import (PERMISSION_DOCUMENT_NEW_VERSION,
-    PERMISSION_DOCUMENT_CREATE)
+from documents.permissions import (PERMISSION_DOCUMENT_CREATE,
+                                   PERMISSION_DOCUMENT_NEW_VERSION)
 
-from .models import (WebForm, StagingFolder, WatchFolder)
-from .permissions import (PERMISSION_SOURCES_SETUP_VIEW,
-    PERMISSION_SOURCES_SETUP_EDIT, PERMISSION_SOURCES_SETUP_DELETE,
-    PERMISSION_SOURCES_SETUP_CREATE)
+from .models import (StagingFolder, WatchFolder, WebForm)
+from .permissions import (PERMISSION_SOURCES_SETUP_CREATE,
+                          PERMISSION_SOURCES_SETUP_DELETE,
+                          PERMISSION_SOURCES_SETUP_EDIT,
+                          PERMISSION_SOURCES_SETUP_VIEW)
 
 document_create_multiple = {'text': _(u'Upload new documents'), 'view': 'sources:document_create_multiple', 'famfam': 'page_add', 'permissions': [PERMISSION_DOCUMENT_CREATE], 'children_view_regex': [r'upload_interactive']}
 document_create_siblings = {'text': _(u'Clone metadata'), 'view': 'sources:document_create_siblings', 'args': 'object.id', 'famfam': 'page_copy', 'permissions': [PERMISSION_DOCUMENT_CREATE]}

mayan/apps/sources/management/commands/bulk_upload.py

@@ -8,10 +8,10 @@ import sys
 from django.core.management.base import CommandError, LabelCommand
 
 from documents.models import DocumentType
+from common.compressed_files import NotACompressedFile
 from metadata.api import convert_dict_to_dict_list
 
 from ...models import OutOfProcess
-from common.compressed_files import NotACompressedFile
 
 class Command(LabelCommand):
     args = '<filename>'

mayan/apps/sources/managers.py

@@ -1,7 +1,7 @@
 from ast import literal_eval
 
-from django.db import models
 from django.contrib.contenttypes.models import ContentType
+from django.db import models
 
 
 class SourceTransformationManager(models.Manager):

mayan/apps/sources/permissions.py

@@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _
 from permissions.models import Permission, PermissionNamespace
 
 sources_setup_namespace = PermissionNamespace('sources_setup', _(u'Sources setup'))
-PERMISSION_SOURCES_SETUP_VIEW = Permission.objects.register(sources_setup_namespace, 'sources_setup_view', _(u'View existing document sources'))
-PERMISSION_SOURCES_SETUP_EDIT = Permission.objects.register(sources_setup_namespace, 'sources_setup_edit', _(u'Edit document sources'))
-PERMISSION_SOURCES_SETUP_DELETE = Permission.objects.register(sources_setup_namespace, 'sources_setup_delete', _(u'Delete document sources'))
 PERMISSION_SOURCES_SETUP_CREATE = Permission.objects.register(sources_setup_namespace, 'sources_setup_create', _(u'Create new document sources'))
+PERMISSION_SOURCES_SETUP_DELETE = Permission.objects.register(sources_setup_namespace, 'sources_setup_delete', _(u'Delete document sources'))
+PERMISSION_SOURCES_SETUP_EDIT = Permission.objects.register(sources_setup_namespace, 'sources_setup_edit', _(u'Edit document sources'))
+PERMISSION_SOURCES_SETUP_VIEW = Permission.objects.register(sources_setup_namespace, 'sources_setup_view', _(u'View existing document sources'))

mayan/apps/sources/views.py

@@ -17,20 +17,21 @@ from common.utils import encapsulate
 from documents.exceptions import NewDocumentVersionNotAllowed
 from documents.models import DocumentType, Document
 from documents.permissions import (PERMISSION_DOCUMENT_CREATE,
-    PERMISSION_DOCUMENT_NEW_VERSION)
+                                   PERMISSION_DOCUMENT_NEW_VERSION)
 from metadata.api import decode_metadata_from_url, metadata_repr_as_list
 from permissions.models import Permission
 
-from .forms import (SourceTransformationForm, SourceTransformationForm_create,
-    WebFormSetupForm, StagingFolderSetupForm, StagingDocumentForm, WebFormForm,
-    WatchFolderSetupForm)
-from .literals import (SOURCE_CHOICE_WEB_FORM, SOURCE_CHOICE_STAGING,
-    SOURCE_CHOICE_WATCH, SOURCE_UNCOMPRESS_CHOICE_Y, SOURCE_UNCOMPRESS_CHOICE_ASK)
-from .models import (WebForm, StagingFolder, SourceTransformation,
-    WatchFolder)
-from .permissions import (PERMISSION_SOURCES_SETUP_VIEW,
-    PERMISSION_SOURCES_SETUP_EDIT, PERMISSION_SOURCES_SETUP_DELETE,
-    PERMISSION_SOURCES_SETUP_CREATE)
+from .forms import (StagingDocumentForm, StagingFolderSetupForm,
+                    SourceTransformationForm, SourceTransformationForm_create,
+                    WatchFolderSetupForm, WebFormForm, WebFormSetupForm)
+from .literals import (SOURCE_CHOICE_STAGING, SOURCE_CHOICE_WATCH,
+                       SOURCE_CHOICE_WEB_FORM, SOURCE_UNCOMPRESS_CHOICE_ASK,
+                       SOURCE_UNCOMPRESS_CHOICE_Y)
+from .models import StagingFolder, SourceTransformation, WatchFolder, WebForm
+from .permissions import (PERMISSION_SOURCES_SETUP_CREATE,
+                          PERMISSION_SOURCES_SETUP_DELETE,
+                          PERMISSION_SOURCES_SETUP_EDIT,
+                          PERMISSION_SOURCES_SETUP_VIEW)
 
 
 def document_create_siblings(request, document_id):

mayan/apps/sources/widgets.py

@@ -9,7 +9,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from converter.literals import (DEFAULT_PAGE_NUMBER, DEFAULT_ROTATION,
                                 DEFAULT_ZOOM_LEVEL)
-from documents.settings import THUMBNAIL_SIZE, PREVIEW_SIZE
+from documents.settings import PREVIEW_SIZE, THUMBNAIL_SIZE
 
 
 class FamFamRadioFieldRenderer(forms.widgets.RadioFieldRenderer):

mayan/apps/sources/wizards.py

@@ -9,7 +9,7 @@ from django.utils.translation import ugettext_lazy as _
 from common.views import MayanPermissionCheckMixin
 from documents.forms import DocumentTypeSelectForm
 from documents.permissions import PERMISSION_DOCUMENT_CREATE
-from metadata.forms import MetadataSelectionForm, MetadataFormSet
+from metadata.forms import MetadataFormSet, MetadataSelectionForm
 
 
 class DocumentCreateWizard(MayanPermissionCheckMixin, SessionWizardView):