Clean up (unused imports, PEP8, etc)

apps/common/__init__.py

@@ -31,8 +31,8 @@ bind_links(['current_user_details', 'current_user_edit', 'password_change_view']
 register_top_menu('about', link=Link(text=_(u'about'), view='about_view', sprite='information'), position=-1)
 
 
-@receiver(post_syncdb, dispatch_uid='create_superuser', sender=auth_models)
+@receiver(post_syncdb, dispatch_uid='create_superuser_processor', sender=auth_models)
-def create_superuser(sender, **kwargs):
+def create_superuser_processor(sender, **kwargs):
     """
     From https://github.com/lambdalisue/django-qwert/blob/master/qwert/autoscript/__init__.py
     From http://stackoverflow.com/questions/1466827/ --

apps/common/classes.py

@@ -1,8 +1,6 @@
 from __future__ import absolute_import
 
 import logging
-import sys
-import types
 
 from django.contrib.contenttypes.models import ContentType
 from django.db.models.base import ModelBase

apps/common/conf/settings.py

@@ -67,4 +67,3 @@ Setting(
     default=False,
     description=_(u'Allow non authenticated users, access to all views'),
 )
-

apps/document_acls/views.py

@@ -1,5 +1,4 @@
 from django.shortcuts import get_object_or_404
-from django.utils.translation import ugettext_lazy as _
 
 from documents.models import Document
 from acls.views import acl_list_for

apps/document_indexing/__init__.py

@@ -25,6 +25,7 @@ from .permissions import (PERMISSION_DOCUMENT_INDEXING_VIEW,
 )
 from .api import update_indexes, delete_indexes
 
+
 def is_root_node(context):
     return context['node'].parent is None
 
@@ -34,7 +35,7 @@ def is_not_instance_root_node(context):
 
 logger = logging.getLogger(__name__)
 
-index_setup = Link(text=_(u'indexes'), view='index_setup_list', icon='tab.png', permissions=[PERMISSION_DOCUMENT_INDEXING_SETUP])#, children_view_regex=[r'^index_setup', r'^template_node'])
+index_setup = Link(text=_(u'indexes'), view='index_setup_list', icon='tab.png', permissions=[PERMISSION_DOCUMENT_INDEXING_SETUP])  # children_view_regex=[r'^index_setup', r'^template_node'])
 index_setup_list = Link(text=_(u'index list'), view='index_setup_list', sprite='tab', permissions=[PERMISSION_DOCUMENT_INDEXING_SETUP])
 index_setup_create = Link(text=_(u'create index'), view='index_setup_create', sprite='tab_add', permissions=[PERMISSION_DOCUMENT_INDEXING_CREATE])
 index_setup_edit = Link(text=_(u'edit'), view='index_setup_edit', args='index.pk', sprite='tab_edit', permissions=[PERMISSION_DOCUMENT_INDEXING_EDIT])

apps/document_indexing/forms.py

@@ -1,7 +1,6 @@
 from __future__ import absolute_import
 
 from django import forms
-from django.utils.translation import ugettext_lazy as _
 
 from .models import Index, IndexTemplateNode
 

apps/document_indexing/migrations/0001_initial.py

@@ -1,13 +1,12 @@
 # encoding: utf-8
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
 
+
 class Migration(SchemaMigration):
 
     def forwards(self, orm):
-        
         # Adding model 'Index'
         db.create_table('document_indexing_index', (
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
@@ -52,7 +51,6 @@ class Migration(SchemaMigration):
         ))
         db.send_create_signal('document_indexing', ['DocumentRenameCount'])
 
-
     def backwards(self, orm):
         
         # Deleting model 'Index'
@@ -67,7 +65,6 @@ class Migration(SchemaMigration):
         # Deleting model 'DocumentRenameCount'
         db.delete_table('document_indexing_documentrenamecount')
 
-
     models = {
         'auth.group': {
             'Meta': {'object_name': 'Group'},

apps/documents/__init__.py

@@ -6,7 +6,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from common.utils import validate_path, encapsulate
 from navigation.api import (bind_links, register_top_menu,
-    register_model_list_columns, register_multi_item_links,
+    register_model_list_columns,
     register_sidebar_template, Link)
 from main.api import register_diagnostic, register_maintenance_links
 from history.api import register_history_type
@@ -17,27 +17,21 @@ from acls.api import class_permissions
 from .models import (Document, DocumentPage,
     DocumentPageTransformation, DocumentType, DocumentTypeFilename,
     DocumentVersion)
-from .permissions import (PERMISSION_DOCUMENT_CREATE,
+from .permissions import (PERMISSION_DOCUMENT_PROPERTIES_EDIT,
-    PERMISSION_DOCUMENT_PROPERTIES_EDIT, PERMISSION_DOCUMENT_VIEW,
+    PERMISSION_DOCUMENT_VIEW, PERMISSION_DOCUMENT_DELETE,
-    PERMISSION_DOCUMENT_DELETE, PERMISSION_DOCUMENT_DOWNLOAD,
+    PERMISSION_DOCUMENT_DOWNLOAD, PERMISSION_DOCUMENT_TRANSFORM,
-    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,
     PERMISSION_DOCUMENT_NEW_VERSION)
 from .literals 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
 from .links import (document_list, document_list_recent, document_create_multiple,
     document_create_siblings, document_view_simple, document_view_advanced,
-    document_delete, document_multiple_delete, document_edit, document_preview,
+    document_delete, document_edit, document_download, document_version_download,
-    document_download, document_multiple_download, document_version_download,
     document_find_duplicates, document_find_all_duplicates,
     document_update_page_count, document_clear_transformations,
-    document_multiple_clear_transformations, document_print, document_history_view,
+    document_print, document_history_view,
     document_missing_list)
 from .links import (document_type_list, document_type_setup, document_type_document_list,
     document_type_edit, document_type_delete, document_type_create, document_type_filename_list,

apps/documents/conf/settings.py

@@ -10,6 +10,7 @@ from django.conf import settings
 from storage.backends.filebasedstorage import FileBasedStorage
 from smart_settings.api import Setting, SettingNamespace
 
+
 def default_checksum(x):
     """hashlib.sha256(x).hexdigest()"""
     return hashlib.sha256(x).hexdigest()

apps/documents/forms.py

@@ -318,5 +318,3 @@ class DocumentDownloadForm(forms.Form):
         if len(self.document_versions) > 1:
             self.fields['compressed'].initial = True
             self.fields['compressed'].widget.attrs.update({'disabled': True})
-    
-    

apps/documents/links.py

@@ -2,9 +2,7 @@ from __future__ import absolute_import
 
 from django.utils.translation import ugettext_lazy as _
 
-from navigation.api import (bind_links, register_top_menu,
+from navigation.api import Link
-    register_model_list_columns, register_multi_item_links,
-    register_sidebar_template, Link)
 from history.permissions import PERMISSION_HISTORY_VIEW
 
 from .permissions import (PERMISSION_DOCUMENT_CREATE,
@@ -13,12 +11,12 @@ from .permissions import (PERMISSION_DOCUMENT_CREATE,
     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,
+    PERMISSION_DOCUMENT_TYPE_CREATE, PERMISSION_DOCUMENT_TYPE_VIEW)
-    PERMISSION_DOCUMENT_NEW_VERSION)
+
 from .conf.settings import ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL
 
-# Document page links expressions
 
+# Document page links expressions
 def is_first_page(context):
     return context['page'].page_number <= 1
 

apps/documents/models.py

@@ -296,7 +296,6 @@ class Document(models.Model):
         return filename, extension[1:]
 
 
-
 class DocumentVersion(models.Model):
     """
     Model that describes a document version and its properties

apps/documents/utils.py

@@ -2,6 +2,7 @@ import os
 
 from common.conf.settings import TEMPORARY_DIRECTORY
 
+
 def document_save_to_temp_dir(document, filename, buffer_size=1024 * 1024):
     temporary_path = os.path.join(TEMPORARY_DIRECTORY, filename)
     return document.save_to_file(temporary_path, buffer_size)

apps/folders/migrations/0001_initial.py

@@ -1,16 +1,15 @@
 # encoding: utf-8
-import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
 
+
 class Migration(SchemaMigration):
     depends_on = (
         ('documents', '0001_initial'),
     )
 
     def forwards(self, orm):
-        
         # Adding model 'Folder'
         db.create_table('folders_folder', (
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
@@ -31,9 +30,7 @@ class Migration(SchemaMigration):
         ))
         db.send_create_signal('folders', ['FolderDocument'])
 
-
     def backwards(self, orm):
-        
         # Removing unique constraint on 'Folder', fields ['title', 'user']
         db.delete_unique('folders_folder', ['title', 'user_id'])
 
@@ -43,7 +40,6 @@ class Migration(SchemaMigration):
         # Deleting model 'FolderDocument'
         db.delete_table('folders_folderdocument')
 
-
     models = {
         'auth.group': {
             'Meta': {'object_name': 'Group'},

apps/folders/migrations/0002_increase_title_size.py

@@ -5,19 +5,14 @@ from south.v2 import SchemaMigration
 from django.db import models
 
 class Migration(SchemaMigration):
-
     def forwards(self, orm):
-        
         # Changing field 'Folder.title'
         db.alter_column('folders_folder', 'title', self.gf('django.db.models.fields.CharField')(max_length=128))
 
-
     def backwards(self, orm):
-        
         # Changing field 'Folder.title'
         db.alter_column('folders_folder', 'title', self.gf('django.db.models.fields.CharField')(max_length=32))
 
-
     models = {
         'auth.group': {
             'Meta': {'object_name': 'Group'},

apps/main/__init__.py

@@ -3,7 +3,7 @@ from __future__ import absolute_import
 from django.utils.translation import ugettext_lazy as _
 from django.conf import settings
 
-from navigation.api import bind_links, Link, register_top_menu
+from navigation.api import Link, register_top_menu
 from project_setup.api import register_setup
 from project_tools.api import register_tool
 

apps/main/utils.py

@@ -1,5 +1,4 @@
-from navigation.api import (register_top_menu, register_sidebar_template,
+from navigation.api import register_multi_item_links
-    bind_links, Link, register_multi_item_links)
 
 from documents.links import document_multiple_clear_transformations, document_multiple_delete, document_multiple_download
 from metadata import metadata_multiple_add, metadata_multiple_edit, metadata_multiple_remove
@@ -7,7 +6,6 @@ from ocr import submit_document_multiple
 
 
 def register_multi_items_links():
-    
     view = [
         # folders
         'folder_view',

apps/navigation/templatetags/navigation_tags.py

@@ -10,7 +10,6 @@ from django.core.urlresolvers import reverse
 from django.template import (TemplateSyntaxError, Library,
     Node, Variable, VariableDoesNotExist)
 from django.utils.translation import ugettext as _
-from django.utils.encoding import smart_str, force_unicode, smart_unicode
 
 from ..api import (link_binding, multi_object_navigation,
     sidebar_templates, get_context_navigation_links)
@@ -211,6 +210,7 @@ def resolve_template_variable(context, name):
 
 
 '''
+
 class GetNavigationLinks(Node):
     def __init__(self, menu_name=None, links_dict=link_binding, var_name='object_navigation_links'):
         self.menu_name = menu_name

apps/ocr/__init__.py

@@ -93,6 +93,7 @@ def document_post_save(sender, instance, **kwargs):
 #        logger.debug('got call_queue signal: %s' % kwargs)
 #        task_process_document_queues()
 
+
 @receiver(post_syncdb, dispatch_uid='create_default_queue', sender=ocr_models)
 def create_default_queue_signal_handler(sender, **kwargs):
     create_default_queue()

apps/ocr/conf/settings.py

@@ -2,7 +2,6 @@
 
 from django.utils.translation import ugettext_lazy as _
 
-<<<<<<< HEAD
 from smart_settings.api import Setting, SettingNamespace
 
 namespace = SettingNamespace('ocr', _(u'OCR'), module='ocr.conf.settings')

apps/ocr/tasks.py

@@ -14,8 +14,7 @@ from .literals import (QUEUEDOCUMENT_STATE_PENDING,
     QUEUEDOCUMENT_STATE_PROCESSING, DOCUMENTQUEUE_STATE_ACTIVE,
     QUEUEDOCUMENT_STATE_ERROR)
 from .models import QueueDocument, DocumentQueue
-from .conf.settings import (NODE_CONCURRENT_EXECUTION, REPLICATION_DELAY,
+from .conf.settings import NODE_CONCURRENT_EXECUTION, REPLICATION_DELAY
-    QUEUE_PROCESSING_INTERVAL)
 
 LOCK_EXPIRE = 60 * 10  # Lock expires in 10 minutes
 # TODO: Tie LOCK_EXPIRATION with hard task timeout

apps/ocr/views.py

@@ -19,9 +19,8 @@ from .permissions import (PERMISSION_OCR_DOCUMENT,
     PERMISSION_OCR_DOCUMENT_DELETE, PERMISSION_OCR_QUEUE_ENABLE_DISABLE,
     PERMISSION_OCR_CLEAN_ALL_PAGES, PERMISSION_OCR_QUEUE_EDIT)
 from .models import DocumentQueue, QueueDocument, QueueTransformation
-from .literals import (QUEUEDOCUMENT_STATE_PENDING,
+from .literals import (QUEUEDOCUMENT_STATE_PROCESSING,
-    QUEUEDOCUMENT_STATE_PROCESSING, DOCUMENTQUEUE_STATE_STOPPED,
+    DOCUMENTQUEUE_STATE_ACTIVE, DOCUMENTQUEUE_STATE_STOPPED)
-    DOCUMENTQUEUE_STATE_ACTIVE)
 from .exceptions import AlreadyQueued, ReQueueError
 from .api import clean_pages
 from .forms import QueueTransformationForm, QueueTransformationForm_create

apps/project_setup/views.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-from django.shortcuts import render_to_response, get_object_or_404
+from django.shortcuts import render_to_response
 from django.template import RequestContext
 from django.utils.translation import ugettext_lazy as _
 

apps/project_tools/views.py

@@ -1,6 +1,6 @@
 from __future__ import absolute_import
 
-from django.shortcuts import render_to_response, get_object_or_404
+from django.shortcuts import render_to_response
 from django.template import RequestContext
 from django.utils.translation import ugettext_lazy as _
 

apps/scheduler/api.py

@@ -24,4 +24,3 @@ def remove_job(name):
     if name in registered_jobs:
         scheduler.unschedule_job(registered_jobs[name]['job'])
         registered_jobs.pop(name)
-        

apps/smart_settings/api.py

@@ -3,8 +3,6 @@ from __future__ import absolute_import
 from django.conf import settings as django_settings
 from django.utils.importlib import import_module
 
-from django.utils.translation import ugettext_lazy as _
-
 settings = {}
 settings_list = []
 namespace_list = []

apps/smart_settings/views.py

@@ -8,7 +8,7 @@ from django.utils.safestring import mark_safe
 from common.utils import return_type, encapsulate
 from common.widgets import exists_with_famfam
 
-from .api import settings, settings_list, namespace_list
+from .api import settings_list
 
 
 def setting_list(request):
@@ -26,14 +26,6 @@ def setting_list(request):
                 )))
             },
         ],
-        #'temporary_navigation_links': {
-        #    'sidebar': {
-        #        'links': links,
-        #        'upload_interactive': {
-        #            'links': links
-        #        }
-        #    }
-        #},        
     }
 
     return render_to_response('generic_list.html', context,