diff --git a/apps/app_registry/models.py b/apps/app_registry/models.py index 012bede184..58a6d0c11f 100644 --- a/apps/app_registry/models.py +++ b/apps/app_registry/models.py @@ -1,6 +1,5 @@ from __future__ import absolute_import -import datetime import logging import imp import sys @@ -8,9 +7,6 @@ import sys from django.db import models from django.db import DatabaseError, transaction from django.utils.translation import ugettext_lazy as _ -from django.utils.translation import ugettext -from django.contrib.contenttypes.models import ContentType -from django.contrib.contenttypes import generic from django.utils.importlib import import_module from common.models import TranslatableLabelMixin, LiveObjectMixin @@ -73,7 +69,6 @@ class App(TranslatableLabelMixin, LiveObjectMixin, models.Model): for dependency_name in getattr(registration, 'dependencies', []): dependency, created = App.objects.get_or_create(name=dependency_name) app.dependencies.add(dependency) - app.icon = getattr(registration, 'icon', None) settings = getattr(registration, 'settings', None) @@ -111,10 +106,6 @@ class App(TranslatableLabelMixin, LiveObjectMixin, models.Model): logger.debug('bootstrap_model: %s' % bootstrap_model) BootstrapModel(model_name=bootstrap_model.get('name'), app_name=app_name, sanitize=bootstrap_model.get('sanitize', True)) - - #def set_backup(self, *args, **kwargs): - # return AppBackup(self, *args, **kwargs) - def __unicode__(self): return unicode(self.label) diff --git a/apps/app_registry/views.py b/apps/app_registry/views.py index 2ba4106e6e..33e04a0f77 100644 --- a/apps/app_registry/views.py +++ b/apps/app_registry/views.py @@ -1,10 +1,6 @@ from __future__ import absolute_import -from django.conf import settings -from django.contrib import messages -from django.core.urlresolvers import reverse -from django.http import HttpResponseRedirect -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 as _ @@ -19,13 +15,13 @@ def app_list(request): #order = [i for i,f in sorted(smart_modules.items(), key=lambda k: 'dependencies' in k[1] and k[1]['dependencies'])] return render_to_response('generic_list.html', { - 'object_list' : App.live.all(), + 'object_list': App.live.all(), 'hide_object': True, 'title': _(u'registered apps'), 'extra_columns': [ {'name': _(u'label'), 'attribute': 'label'}, - {'name':_(u'icon'), 'attribute': encapsulate(lambda x: (getattr(x, 'icon') or icon_app).display_big())}, - {'name':_(u'description'), 'attribute': 'description'}, - {'name':_(u'dependencies'), 'attribute': encapsulate(lambda x: u', '.join([unicode(dependency) for dependency in x.dependencies.all()]))}, + {'name': _(u'icon'), 'attribute': encapsulate(lambda x: (getattr(x, 'icon') or icon_app).display_big())}, + {'name': _(u'description'), 'attribute': 'description'}, + {'name': _(u'dependencies'), 'attribute': encapsulate(lambda x: u', '.join([unicode(dependency) for dependency in x.dependencies.all()]))}, ], }, context_instance=RequestContext(request)) diff --git a/apps/clustering/models.py b/apps/clustering/models.py index 2e34730398..b6d26b6731 100644 --- a/apps/clustering/models.py +++ b/apps/clustering/models.py @@ -72,13 +72,13 @@ class Node(models.Model): return self.state == NODE_STATE_HEALTHY def mark_as_dead(self): - self.state=NODE_STATE_DEAD + self.state = NODE_STATE_DEAD node_died.send(sender=self, node=self) self.save() def send_heartbeat(self): self.refresh() - self.state=NODE_STATE_HEALTHY + self.state = NODE_STATE_HEALTHY self.heartbeat = datetime.datetime.now() self.save() diff --git a/apps/document_indexing/filesystem.py b/apps/document_indexing/filesystem.py index 4c00f3001d..053f6a6605 100644 --- a/apps/document_indexing/filesystem.py +++ b/apps/document_indexing/filesystem.py @@ -6,7 +6,6 @@ import os from django.utils.translation import ugettext_lazy as _ - def assemble_suffixed_filename(filename, suffix=0): """ Split document filename, to attach suffix to the name part then diff --git a/apps/documents/__init__.py b/apps/documents/__init__.py index 241e24afd4..f37b1dfd6c 100644 --- a/apps/documents/__init__.py +++ b/apps/documents/__init__.py @@ -28,7 +28,7 @@ from .links import (document_list, document_list_recent, document_update_page_count, document_clear_transformations, document_print, document_history_view, document_missing_list) -from .links import (document_type_list, document_type_setup, document_type_document_list, +from .links import (document_type_list, document_type_document_list, document_type_edit, document_type_delete, document_type_create, document_type_filename_list, document_type_filename_create, document_type_filename_edit, document_type_filename_delete, link_documents_menu) @@ -121,4 +121,3 @@ class_permissions(Document, [ PERMISSION_DOCUMENT_VERSION_REVERT, PERMISSION_HISTORY_VIEW ]) - diff --git a/apps/documents/links.py b/apps/documents/links.py index d3eeef6270..b4013ac372 100644 --- a/apps/documents/links.py +++ b/apps/documents/links.py @@ -31,6 +31,7 @@ from .icons import (icon_documents, icon_create_siblings, icon_document_delete, icon_document_type_filename_edit, icon_document_type_filename_delete, icon_document_missing_list) + # Document page links expressions def is_first_page(context): return context['page'].page_number <= 1 diff --git a/apps/documents/post_init.py b/apps/documents/post_init.py index 0af6de3cd7..b37508444d 100644 --- a/apps/documents/post_init.py +++ b/apps/documents/post_init.py @@ -5,7 +5,7 @@ import tempfile from django.db import models from django.utils.translation import ugettext_lazy as _ -from common.utils import validate_path, encapsulate +from common.utils import validate_path from .models import DocumentVersion, get_filename_from_uuid from .settings import STORAGE_BACKEND, CACHE_PATH @@ -15,4 +15,4 @@ from .settings import STORAGE_BACKEND, CACHE_PATH if (validate_path(CACHE_PATH) == False) or (not CACHE_PATH): setattr(document_settings, 'CACHE_PATH', tempfile.mkdtemp()) -DocumentVersion._meta.get_field('file').storage=STORAGE_BACKEND() +DocumentVersion._meta.get_field('file').storage = STORAGE_BACKEND() diff --git a/apps/icons/__init__.py b/apps/icons/__init__.py index 2350021044..97c7e9ca2b 100644 --- a/apps/icons/__init__.py +++ b/apps/icons/__init__.py @@ -1,6 +1,5 @@ from __future__ import absolute_import -import inspect import os import glob @@ -15,7 +14,7 @@ for app_name in django_settings.INSTALLED_APPS: except ImportError: pass else: - for icon_set_name in [os.path.basename(f)[:-3] for f in glob.glob(os.path.dirname(sets_top.__file__)+"/*.py")][1:]: + for icon_set_name in [os.path.basename(f)[:-3] for f in glob.glob(os.path.dirname(sets_top.__file__) + "/*.py")][1:]: icon_set_module = import_module('%s.iconsets.%s' % (app_name, icon_set_name)) klass = getattr(icon_set_module, 'IconSet', None) if klass: diff --git a/apps/icons/iconsets/custom.py b/apps/icons/iconsets/custom.py index 8a2ad00fcd..beba8b4d5c 100644 --- a/apps/icons/iconsets/custom.py +++ b/apps/icons/iconsets/custom.py @@ -8,7 +8,7 @@ class IconSet(IconSetBase): path = 'custom' name = 'custom' label = _(u'Custom') - directory='custom' + directory = 'custom' dictionary = { FILE_EXTENSION_ERROR: 'file_extension_error.png', FILE_EXTENSION_UNKNOWN: 'file_extension_unknown.png' diff --git a/apps/icons/iconsets/fat_cow.py b/apps/icons/iconsets/fat_cow.py index d057b317ad..3823da1b98 100644 --- a/apps/icons/iconsets/fat_cow.py +++ b/apps/icons/iconsets/fat_cow.py @@ -5,11 +5,11 @@ from icons.classes import IconSetBase class IconSet(IconSetBase): - name='fat_cow' - label=_(u'Fat cow') - directory='fat_cow' - available_sizes=['32x32', '16x16'] - dictionary={ + name = 'fat_cow' + label = _(u'Fat cow') + directory = 'fat_cow' + available_sizes = ['32x32', '16x16'] + dictionary = { ADD: 'add.png', APPLICATION_VIEW_ICONS: 'application_view_icons.png', ARROW_TURN_RIGHT: 'arrow_turn_right.png', @@ -101,7 +101,7 @@ class IconSet(IconSetBase): PACKAGE: 'package.png', PAGE: 'page.png', PAGE_COPY: 'page_copy.png', - PAGE_GEAR:'page_gear.png', + PAGE_GEAR: 'page_gear.png', PAGE_GO: 'page_go.png', PAGE_DELETE: 'page_delete.png', PAGE_EDIT: 'page_edit.png', diff --git a/apps/job_processor/models.py b/apps/job_processor/models.py index c2412676d6..f61d7675e6 100644 --- a/apps/job_processor/models.py +++ b/apps/job_processor/models.py @@ -38,7 +38,7 @@ class Job(object): # OR launch 2 processes: monitor & actual process node = Node.objects.myself() worker, created = Worker.objects.get_or_create(node=node, pid=os.getpid()) - worker.job_queue_item=job_queue_item + worker.job_queue_item = job_queue_item worker.save() try: transaction.commit_on_success(function)(**loads(job_queue_item.kwargs)) @@ -248,7 +248,7 @@ class JobQueueItem(models.Model): at_top: requeue at the top of the file usually for jobs that die and shouldn't be placed at the bottom of the queue """ - if self.is_in_error_state or force==True: + if self.is_in_error_state or force == True: # TODO: raise exception if not in error state self.state = JOB_STATE_PENDING if not at_top: diff --git a/apps/job_processor/urls.py b/apps/job_processor/urls.py index c9a2cc3762..ae005b0ab9 100644 --- a/apps/job_processor/urls.py +++ b/apps/job_processor/urls.py @@ -5,7 +5,7 @@ urlpatterns = patterns('job_processor.views', url(r'^node/(?P\d+)/workers/$', 'node_workers', (), 'node_workers'), url(r'^queue/list/$', 'job_queues', (), 'job_queues'), url(r'^queue/(?P\d+)/items/pending/$', 'job_queue_items', {'pending_jobs': True}, 'job_queue_items_pending'), - url(r'^queue/(?P\d+)/items/error/$', 'job_queue_items', {'error_jobs' :True}, 'job_queue_items_error'), + url(r'^queue/(?P\d+)/items/error/$', 'job_queue_items', {'error_jobs': True}, 'job_queue_items_error'), url(r'^queue/(?P\d+)/items/active/$', 'job_queue_items', {'active_jobs' :True}, 'job_queue_items_active'), url(r'^queue/(?P\d+)/start/$', 'job_queue_start', (), 'job_queue_start'), url(r'^queue/(?P\d+)/stop/$', 'job_queue_stop', (), 'job_queue_stop'), diff --git a/apps/navigation/__init__.py b/apps/navigation/__init__.py index 29e10cc652..e69de29bb2 100644 --- a/apps/navigation/__init__.py +++ b/apps/navigation/__init__.py @@ -1,3 +0,0 @@ -from __future__ import absolute_import - -from .classes import Link diff --git a/apps/navigation/api.py b/apps/navigation/api.py index f90cdd2622..8a4f943307 100644 --- a/apps/navigation/api.py +++ b/apps/navigation/api.py @@ -2,14 +2,9 @@ from __future__ import absolute_import import logging -from elementtree.ElementTree import Element +from elementtree.ElementTree import Element, SubElement from django.template import (VariableDoesNotExist, Variable) -from django.utils.encoding import smart_str, smart_unicode -from django.core.urlresolvers import reverse, NoReverseMatch -from django.utils.http import urlquote, urlencode - -from elementtree.ElementTree import SubElement from .utils import resolve_to_name, get_navigation_objects @@ -83,7 +78,7 @@ def get_context_navigation_links(context, menu_name=None, links_dict=bound_links current_path = request.META['PATH_INFO'] current_view = resolve_to_name(current_path) context_links = {} - + # Don't fudge with the original global dictionary # TODO: fix this links_dict = links_dict.copy() diff --git a/apps/navigation/registry.py b/apps/navigation/registry.py index 3ed92f7fd8..31330f76ac 100644 --- a/apps/navigation/registry.py +++ b/apps/navigation/registry.py @@ -2,8 +2,6 @@ from __future__ import absolute_import from django.utils.translation import ugettext_lazy as _ -from smart_settings import LocalScope - from .icons import icon_navigation name = 'navigation' diff --git a/apps/navigation/templatetags/navigation_tags.py b/apps/navigation/templatetags/navigation_tags.py index efa21869c8..d32e19a6da 100644 --- a/apps/navigation/templatetags/navigation_tags.py +++ b/apps/navigation/templatetags/navigation_tags.py @@ -24,10 +24,11 @@ class TopMenuNavigationNode(Node): request = Variable('request').resolve(context) current_path = request.META['PATH_INFO'] current_view = resolve_to_name(current_path) - + context['menu_links'] = [menu.get('link').resolve(context, request=request, current_path=current_path, current_view=current_view) for menu in main_menu.getchildren()] return '' + @register.tag def get_top_menu_links(parser, token): return TopMenuNavigationNode() diff --git a/apps/ocr/post_init.py b/apps/ocr/post_init.py index 27526965e2..fc2c537583 100644 --- a/apps/ocr/post_init.py +++ b/apps/ocr/post_init.py @@ -52,7 +52,6 @@ def document_post_save(sender, instance, **kwargs): bind_links([Document], [submit_document]) -bind_links([OCRProcessingSingleton], [ocr_disable, ocr_enable]) #namespace = MaintenanceNamespace(label=_(u'OCR')) #namespace.create_tool(all_document_ocr_cleanup) diff --git a/apps/permissions/models.py b/apps/permissions/models.py index 6c559a5ecb..f8868f52de 100644 --- a/apps/permissions/models.py +++ b/apps/permissions/models.py @@ -70,7 +70,6 @@ class PermissionManager(object): except KeyError: raise Permission.DoesNotExist - def __init__(self, model): self.model = model @@ -226,7 +225,7 @@ class Role(models.Model): def remove_member(self, member): member = AnonymousUserSingleton.objects.passthru_check(member) - member_type=ContentType.objects.get_for_model(member) + member_type = ContentType.objects.get_for_model(member) role_member = RoleMember.objects.get(role=self, member_type=member_type, member_id=member.pk) role_member.delete() diff --git a/apps/permissions/post_init.py b/apps/permissions/post_init.py index 21318a403c..d7d9ce4a4d 100644 --- a/apps/permissions/post_init.py +++ b/apps/permissions/post_init.py @@ -6,6 +6,7 @@ from django.core.exceptions import ObjectDoesNotExist from django.dispatch import receiver from .settings import DEFAULT_ROLES +from .models import Role @receiver(post_save, dispatch_uid='set_default_roles', sender=User) diff --git a/apps/permissions/registry.py b/apps/permissions/registry.py index 7619c87aba..33646b05e4 100644 --- a/apps/permissions/registry.py +++ b/apps/permissions/registry.py @@ -13,7 +13,7 @@ description = _(u'Handles the permissions in a project.') icon = icon_permissions dependencies = ['app_registry', 'smart_settings'] -settings=[ +settings = [ { 'name': 'DEFAULT_ROLES', 'default': [], @@ -22,4 +22,4 @@ settings=[ } ] -setup_links=[role_list] +setup_links = [role_list] diff --git a/apps/project_setup/links.py b/apps/project_setup/links.py index 35e30fb46d..ca93b3dd73 100644 --- a/apps/project_setup/links.py +++ b/apps/project_setup/links.py @@ -6,4 +6,4 @@ from navigation import Link from .icons import icon_setup -link_setup=Link(text=_(u'setup'), view='setup_list', icon=icon_setup) +link_setup = Link(text=_(u'setup'), view='setup_list', icon=icon_setup) diff --git a/apps/smart_settings/classes.py b/apps/smart_settings/classes.py index b6b923c358..e1eb31df41 100644 --- a/apps/smart_settings/classes.py +++ b/apps/smart_settings/classes.py @@ -7,7 +7,7 @@ from django.db import transaction, DatabaseError from .models import ClusterSetting -# Namespace + class SettingsNamespace(object): _registry = {} _settings = {} @@ -41,7 +41,6 @@ class SettingsNamespace(object): return self.__class__._settings[self.name].values() -# Scopes class ScopeBase(object): def get_value(self): raise NotImplemented diff --git a/apps/smart_settings/links.py b/apps/smart_settings/links.py index dc02331258..adc8d314c2 100644 --- a/apps/smart_settings/links.py +++ b/apps/smart_settings/links.py @@ -6,6 +6,7 @@ from navigation import Link from .icons import icon_settings + def is_superuser(context): return context['request'].user.is_staff or context['request'].user.is_superuser diff --git a/apps/smart_settings/views.py b/apps/smart_settings/views.py index af017e913f..6589ab6810 100644 --- a/apps/smart_settings/views.py +++ b/apps/smart_settings/views.py @@ -12,6 +12,7 @@ from app_registry.models import App from .classes import SettingsNamespace from .links import is_superuser +from .icons import icon_settings def setting_list(request, app_name=None, object_list=None, title=None, extra_context=None): diff --git a/apps/trash/models.py b/apps/trash/models.py index 57334dcba9..34533f6cd8 100644 --- a/apps/trash/models.py +++ b/apps/trash/models.py @@ -100,7 +100,7 @@ class TrashCanItem(models.Model): def save(self, *args, **kwargs): if not self.pk: - self.trashed_at=datetime.datetime.now() + self.trashed_at = datetime.datetime.now() return super(TrashCanItem, self).save(*args, **kwargs) class Meta: @@ -118,7 +118,7 @@ def new_delete_method(trash_can, old_delete_method): def delete(self, *args, **kwargs): trash = kwargs.pop('trash', True) - if trash==False: + if trash == False: return old_delete_method(self, *args, **kwargs) else: #trashed_item = TrashedItem.objects.create(trash_can=trash_can, content_object=self, trashed_at=datetime.datetime.now())