Merge branch 'feature/pep8_cleanups' into development

apps/acls/admin.py

@@ -1,8 +1,6 @@
 from __future__ import absolute_import
 
 from django.contrib import admin
-from django.contrib.contenttypes import generic
-from django.contrib.contenttypes.models import ContentType
 
 from .models import AccessEntry
 

apps/acls/classes.py

@@ -4,10 +4,10 @@ import logging
 import sys
 import types
 
-from django.db import models
 from django.contrib.contenttypes.models import ContentType
 from django.db.models.base import ModelBase
 from django.template.defaultfilters import capfirst
+from django.core.exceptions import ObjectDoesNotExist
 
 from common.models import AnonymousUserSingleton
 
@@ -31,7 +31,7 @@ class EncapsulatedObject(object):
         if hasattr(value, 'contribute_to_class'):
             value.contribute_to_class(cls, name)
         else:
-           setattr(cls, name, value)
+            setattr(cls, name, value)
 
     @classmethod
     def set_source_object_name(cls, new_name):
@@ -40,7 +40,6 @@ class EncapsulatedObject(object):
     #@classmethod
     #def encapsulate_list(cls, source_object=None, app_label=None, model=None, pk=None):
 
-    
     @classmethod
     def encapsulate(cls, source_object):
         source_object = AnonymousUserSingleton.objects.passthru_check(source_object)

apps/acls/forms.py

@@ -4,8 +4,8 @@ from django import forms
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth.models import User, Group
 
-from permissions.models import Permission, Role
+from permissions.models import Role
-from common.utils import generate_choices_w_labels, encapsulate, get_object_name
+from common.utils import get_object_name
 from common.models import AnonymousUserSingleton
 
 from .classes import AccessHolder
@@ -14,6 +14,7 @@ from .classes import AccessHolder
 def _as_choice_list(holders):
     return sorted([(AccessHolder.encapsulate(holder).gid, get_object_name(holder, display_object_type=False)) for holder in holders], key=lambda x: x[1])
 
+
 class HolderSelectionForm(forms.Form):
     holder_gid = forms.ChoiceField(
         label=_(u'New holder')

apps/acls/managers.py

@@ -8,8 +8,10 @@ from django.utils.translation import ugettext
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth.models import User
 from django.core.exceptions import PermissionDenied
+from django.core.urlresolvers import reverse
 
 from common.models import AnonymousUserSingleton
+from permissions.models import Permission
 
 from .classes import EncapsulatedObject, AccessHolder, ClassAccessHolder
 
@@ -17,6 +19,10 @@ logger = logging.getLogger(__name__)
 
 
 class AccessEntryManager(models.Manager):
+    """
+    Implement a 3 tier permission system, involving a permissions, an actor
+    and an object
+    """
     def source_object(self, obj):
         if isinstance(obj, EncapsulatedObject):
             return obj.source_object
@@ -24,9 +30,9 @@ class AccessEntryManager(models.Manager):
             return obj
 
     def grant(self, permission, actor, obj):
-        '''
+        """
         Grant a permission (what), (to) an actor, (on) a specific object
-        '''
+        """
         obj = self.source_object(obj)
         actor = self.source_object(actor)
 
@@ -40,9 +46,9 @@ class AccessEntryManager(models.Manager):
         return created
 
     def revoke(self, permission, actor, obj):
-        '''
+        """
         Revoke a permission (what), (from) an actor, (on) a specific object
-        '''        
+        """
         obj = self.source_object(obj)
         actor = self.source_object(actor)
 
@@ -60,6 +66,9 @@ class AccessEntryManager(models.Manager):
             return False
 
     def has_access(self, permission, actor, obj):
+        """
+        Returns whether an actor has a specific permission for an object
+        """
         obj = self.source_object(obj)
         actor = self.source_object(actor)
 
@@ -70,18 +79,20 @@ class AccessEntryManager(models.Manager):
         actor = AnonymousUserSingleton.objects.passthru_check(actor)
 
         try:
-            access_entry = self.model.objects.get(
+            self.model.objects.get(
                 permission=permission.get_stored_permission(),
                 holder_type=ContentType.objects.get_for_model(actor),
                 holder_id=actor.pk,
                 content_type=ContentType.objects.get_for_model(obj),
                 object_id=obj.pk
             )
-            return True
         except self.model.DoesNotExist:
             return False
+        else:
+            return True
 
     def check_access(self, permission, actor, obj):
+        # TODO: Merge with has_access
         obj = self.source_object(obj)
         actor = self.source_object(actor)
 
@@ -91,6 +102,9 @@ class AccessEntryManager(models.Manager):
             raise PermissionDenied(ugettext(u'Insufficient access.'))
 
     def check_accesses(self, permission_list, actor, obj):
+        """
+        Returns whether an actor has at least one of a list of permissions for an object
+        """
         obj = self.source_object(obj)
         actor = self.source_object(actor)
         for permission in permission_list:
@@ -135,6 +149,10 @@ class AccessEntryManager(models.Manager):
         return holder_list
 
     def get_holder_permissions_for(self, obj, actor):
+        """
+        Returns a list of actors that hold at least one permission for
+        a specific object
+        """
         logger.debug('obj: %s' % obj)
         logger.debug('actor: %s' % actor)
 
@@ -147,6 +165,10 @@ class AccessEntryManager(models.Manager):
         return (access.permission for access in self.model.objects.filter(content_type=content_type, object_id=obj.pk, holder_type=actor_type, holder_id=actor.pk))
 
     def filter_objects_by_access(self, permission, actor, object_list, exception_on_empty=False, related=None):
+        """
+        Filter a list of objects or a QuerySet elements depending on
+        whether the actor holds the specified permission
+        """
         logger.debug('exception_on_empty: %s' % exception_on_empty)
         logger.debug('object_list: %s' % object_list)
 
@@ -182,6 +204,12 @@ class AccessEntryManager(models.Manager):
 
 
 class DefaultAccessEntryManager(models.Manager):
+    """
+    Implement a 3 tier permission system, involving a permission, an actor
+    and a class or content type.  This model keeps track of the access
+    control lists that will be added when an instance of the recorded
+    content type is created.
+    """
     def get_holders_for(self, cls):
         if isinstance(cls, EncapsulatedObject):
             cls = cls.source_object
@@ -202,20 +230,21 @@ class DefaultAccessEntryManager(models.Manager):
                 return True
 
         try:
-            access_entry = self.model.objects.get(
+            self.model.objects.get(
                 permission=permission.get_stored_permission(),
                 holder_type=ContentType.objects.get_for_model(actor),
                 holder_id=actor.pk,
                 content_type=ContentType.objects.get_for_model(cls),
             )
-            return True
         except self.model.DoesNotExist:
             return False
+        else:
+            return True
 
     def grant(self, permission, actor, cls):
-        '''
+        """
         Grant a permission (what), (to) an actor, (on) a specific class
-        '''
+        """
         access_entry, created = self.model.objects.get_or_create(
             permission=permission,
             holder_type=ContentType.objects.get_for_model(actor),
@@ -225,9 +254,9 @@ class DefaultAccessEntryManager(models.Manager):
         return created
 
     def revoke(self, permission, actor, cls):
-        '''
+        """
         Revoke a permission (what), (from) an actor, (on) a specific class
-        '''        
+        """
         try:
             access_entry = self.model.objects.get(
                 permission=permission,

apps/acls/models.py

@@ -8,9 +8,7 @@ from django.utils.translation import ugettext
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes import generic
 from django.core.exceptions import PermissionDenied
-from django.core.urlresolvers import reverse
 from django.core.exceptions import ObjectDoesNotExist
-from django.shortcuts import get_object_or_404
 
 from permissions.models import StoredPermission
 
@@ -22,9 +20,9 @@ logger = logging.getLogger(__name__)
 
 
 class AccessEntry(models.Model):
-    '''
+    """
     Model that hold the permission, object, actor relationship
-    '''
+    """
     permission = models.ForeignKey(StoredPermission, verbose_name=_(u'permission'))
 
     holder_type = models.ForeignKey(
@@ -59,10 +57,10 @@ class AccessEntry(models.Model):
 
 
 class DefaultAccessEntry(models.Model):
-    '''
+    """
     Model that holds the permission, class, actor relationship, that will
     be added upon the creation of an instance of said class
-    '''
+    """
     @classmethod
     def get_classes(cls):
         return [AccessObjectClass.encapsulate(cls) for cls in get_classes()]

apps/acls/views.py

@@ -1,25 +1,21 @@
 from __future__ import absolute_import
 
 import logging
-import operator
-import itertools
 
 from django.utils.translation import ugettext_lazy as _
 from django.http import HttpResponseRedirect, Http404
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.contrib import messages
-from django.views.generic.list_detail import object_list
 from django.core.urlresolvers import reverse
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.auth.models import User, Group
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils.simplejson import loads
 from django.core.exceptions import PermissionDenied
 from django.utils.http import urlencode
 
-from permissions.models import Permission, Role
+from permissions.models import Permission
-from common.utils import generate_choices_w_labels, encapsulate
+from common.utils import encapsulate
 from common.widgets import two_state_template
 
 from .permissions import (ACLS_EDIT_ACL, ACLS_VIEW_ACL,
@@ -29,7 +25,7 @@ from .classes import (AccessHolder, AccessObject, AccessObjectClass,
     ClassAccessHolder)
 from .widgets import object_w_content_type_icon
 from .forms import HolderSelectionForm
-from .api import get_class_permissions_for, get_classes
+from .api import get_class_permissions_for
 
 logger = logging.getLogger(__name__)
 
@@ -46,7 +42,6 @@ def acl_list_for(request, obj, extra_context=None):
 
     logger.debug('obj: %s' % obj)
 
-    ct = ContentType.objects.get_for_model(obj)
     context = {
         'object_list': AccessEntry.objects.get_holders_for(obj),
         'title': _(u'access control lists for: %s' % obj),
@@ -200,7 +195,7 @@ def acl_grant(request):
         for requester, object_permissions in items.items():
             for obj, permissions in object_permissions.items():
                 for permission in permissions:
-                    if AccessEntry.objects.grant(permission, requester.source_object,  obj.source_object):
+                    if AccessEntry.objects.grant(permission, requester.source_object, obj.source_object):
                         messages.success(request, _(u'Permission "%(permission)s" granted to %(actor)s for %(object)s.') % {
                             'permission': permission,
                             'actor': requester,
@@ -294,7 +289,7 @@ def acl_revoke(request):
         for requester, object_permissions in items.items():
             for obj, permissions in object_permissions.items():
                 for permission in permissions:
-                    if AccessEntry.objects.revoke(permission, requester.source_object,  obj.source_object):
+                    if AccessEntry.objects.revoke(permission, requester.source_object, obj.source_object):
                         messages.success(request, _(u'Permission "%(permission)s" revoked of %(actor)s for %(object)s.') % {
                             'permission': permission,
                             'actor': requester,
@@ -381,7 +376,7 @@ def acl_holder_new(request, access_object_gid):
     except ObjectDoesNotExist:
         raise Http404
 
-    return acl_new_holder_for(request, access_object.source_object)#, extra_context={'access_object': access_object})
+    return acl_new_holder_for(request, access_object.source_object)  # , extra_context={'access_object': access_object})
 
 
 # Setup views
@@ -621,7 +616,7 @@ def acl_class_multiple_revoke(request):
         for requester, object_permissions in items.items():
             for obj, permissions in object_permissions.items():
                 for permission in permissions:
-                    if DefaultAccessEntry.objects.revoke(permission, requester.source_object,  obj.source_object):
+                    if DefaultAccessEntry.objects.revoke(permission, requester.source_object, obj.source_object):
                         messages.success(request, _(u'Permission "%(permission)s" revoked of %(actor)s for %(object)s.') % {
                             'permission': permission,
                             'actor': requester,

apps/acls/widgets.py

@@ -1,11 +1,6 @@
 from __future__ import absolute_import
 
-from django.utils.translation import ugettext_lazy as _
 from django.utils.safestring import mark_safe
-from django import forms
-from django.forms.util import flatatt
-from django.utils.html import conditional_escape
-from django.utils.encoding import force_unicode
 from django.contrib.contenttypes.models import ContentType
 from django.db.models.base import ModelBase
 from django.template.defaultfilters import capfirst

apps/common/__init__.py

@@ -5,7 +5,6 @@ import tempfile
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth import models as auth_models
 from django.contrib.auth.management import create_superuser
-from django.db.models import signals
 from django.dispatch import receiver
 from django.db.models.signals import post_syncdb
 

apps/common/compressed_files.py

@@ -1,4 +1,4 @@
-import os, tempfile, zipfile
+import zipfile
 
 try:
     import zlib
@@ -54,7 +54,7 @@ class CompressedFile(object):
             file_input.seek(0)
         except AttributeError:
             # If not, keep it
-            self.zf.write(filename, arcname=arcname, compress_type=COMPRESSION)             
+            self.zf.write(file_input, arcname=arcname, compress_type=COMPRESSION)
         else:
             self.zf.writestr(arcname, file_input.read())
 

apps/common/forms.py

@@ -92,10 +92,10 @@ class FilterForm(forms.Form):
 
 
 class ChoiceForm(forms.Form):
-    '''
+    """
     Form to be used in side by side templates used to add or remove
     items from a many to many field
-    '''
+    """
     def __init__(self, *args, **kwargs):
         choices = kwargs.pop('choices', [])
         label = kwargs.pop('label', _(u'Selection'))
@@ -108,28 +108,28 @@ class ChoiceForm(forms.Form):
 
 
 class UserForm_view(DetailForm):
-    '''
+    """
     Form used to display an user's public details
-    '''
+    """
     class Meta:
         model = User
         fields = ('username', 'first_name', 'last_name', 'email', 'is_staff', 'is_superuser', 'last_login', 'date_joined', 'groups')
 
 
 class UserForm(forms.ModelForm):
-    '''
+    """
     Form used to edit an user's mininal fields by the user himself
-    '''
+    """
     class Meta:
         model = User
         fields = ('first_name', 'last_name')
 
 
 class EmailAuthenticationForm(AuthenticationForm):
-    '''
+    """
     Override the default authentication form to use email address
     authentication
-    '''
+    """
     email = forms.CharField(label=_(u'Email'), max_length=75,
         widget=EmailInput()
     )
@@ -153,7 +153,7 @@ EmailAuthenticationForm.base_fields.keyOrder = ['email', 'password']
 
 class FileDisplayForm(forms.Form):
     text = forms.CharField(
-        label='',#_(u'Text'),
+        label='',  # _(u'Text'),
         widget=forms.widgets.Textarea(
             attrs={'cols': 40, 'rows': 20, 'readonly': 'readonly'}
         )

apps/common/templatetags/set_var.py

@@ -2,6 +2,7 @@ from django import template
 
 register = template.Library()
 
+
 class SetVarNode(template.Node):
     def __init__(self, var_name, var_value):
         self.var_name = var_name
@@ -18,6 +19,7 @@ class SetVarNode(template.Node):
 
         return u""
 
+
 def set_var(parser, token):
     """
     {% set <var_name>  = <var_value> %}

apps/common/tests.py

@@ -20,4 +20,3 @@ Another way to test that 1 + 1 is equal to 2.
 >>> 1 + 1 == 2
 True
 """}
-

apps/common/utils.py

@@ -1,4 +1,4 @@
- # -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 from __future__ import absolute_import
 
 import os
@@ -18,7 +18,7 @@ from django.contrib.auth.models import User
 
 
 def urlquote(link=None, get=None):
-    u'''
+    u"""
     This method does both: urlquote() and urlencode()
 
     urlqoute(): Quote special characters in 'link'
@@ -33,7 +33,7 @@ def urlquote(link=None, get=None):
       urlquote('/mypath/', {'key': 'value'})              --> '/mypath/?key=value'
       urlquote('/mypath/', {'key': ['value1', 'value2']}) --> '/mypath/?key=value1&key=value2'
       urlquote({'key': ['value1', 'value2']})             --> 'key=value1&key=value2'
-    '''
+    """
     if get is None:
         get = []
 
@@ -112,9 +112,9 @@ def pretty_size_10(size):
 # http://www.johncardinal.com/tmgutil/capitalizenames.htm
 
 def proper_name(name):
-    '''
+    """
     Does the work of capitalizing a name (can be a full name).
-    '''
+    """
     mc = re.compile(r'^Mc(\w)(?=\w)', re.I)
     mac = re.compile(r'^Mac(\w)(?=\w)', re.I)
     suffixes = [

apps/common/views.py

@@ -18,19 +18,19 @@ from .conf.settings import LOGIN_METHOD
 
 
 def password_change_done(request):
-    '''
+    """
     View called when the new user password has been accepted
-    '''
+    """
 
     messages.success(request, _(u'Your password has been successfully changed.'))
     return redirect('home')
 
 
 def multi_object_action_view(request):
-    '''
+    """
     Proxy view called first when using a multi object action, which
     then redirects to the appropiate specialized view
-    '''
+    """
 
     next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', '/')))
 
@@ -159,9 +159,9 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef
 
 
 def current_user_details(request):
-    '''
+    """
     Display the current user's details
-    '''
+    """
     form = UserForm_view(instance=request.user)
 
     return render_to_response(
@@ -174,9 +174,9 @@ def current_user_details(request):
 
 
 def current_user_edit(request):
-    '''
+    """
     Allow an user to edit his own details
-    '''
+    """
 
     next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', reverse('current_user_details'))))
 
@@ -199,10 +199,10 @@ def current_user_edit(request):
 
 
 def login_view(request):
-    '''
+    """
     Control how the use is to be authenticated, options are 'email' and
     'username'
-    '''        
+    """
     kwargs = {'template_name': 'login.html'}
 
     if LOGIN_METHOD == 'email':
@@ -217,9 +217,9 @@ def login_view(request):
 
 
 def changelog_view(request):
-    '''
+    """
     Display the included Changelog.txt file from the about menu
-    '''    
+    """
     form = ChangelogForm()
     return render_to_response(
         'generic_detail.html', {
@@ -230,9 +230,9 @@ def changelog_view(request):
 
 
 def license_view(request):
-    '''
+    """
     Display the included LICENSE file from the about menu
-    '''    
+    """
     form = LicenseForm()
     return render_to_response(
         'generic_detail.html', {

apps/common/widgets.py

@@ -10,10 +10,10 @@ from django.utils.encoding import force_unicode
 
 
 class PlainWidget(forms.widgets.Widget):
-    '''
+    """
     Class to define a form widget that effectively nulls the htmls of a
     widget and reduces the output to only it's value
-    '''        
+    """
     def render(self, name, value, attrs=None):
         return mark_safe(u'%s' % value)
 
@@ -74,10 +74,10 @@ def two_state_template(state, famfam_ok_icon=u'tick', famfam_fail_icon=u'cross')
 
 
 class TextAreaDiv(forms.widgets.Widget):
-    '''
+    """
     Class to define a form widget that simulates the behavior of a
     Textarea widget but using a div tag instead
-    '''    
+    """
 
     def __init__(self, attrs=None):
         # The 'rows' and 'cols' attributes are required for HTML correctness.
@@ -98,10 +98,10 @@ class TextAreaDiv(forms.widgets.Widget):
 
 # From: http://www.peterbe.com/plog/emailinput-html5-django
 class EmailInput(forms.widgets.Input):
-    '''
+    """
     Class for a login form widget that accepts only well formated
     email address
-    '''
+    """
     input_type = 'email'
 
     def render(self, name, value, attrs=None):
@@ -114,13 +114,14 @@ class EmailInput(forms.widgets.Input):
 
 
 class ScrollableCheckboxSelectMultiple(forms.widgets.CheckboxSelectMultiple):
-    '''
+    """
     Class for a form widget composed of a selection of checkboxes wrapped
     in a div tag with automatic overflow to add scrollbars when the list
     exceds the height of the div
-    '''
+    """
     def render(self, name, value, attrs=None, choices=()):
-        if value is None: value = []
+        if value is None:
+            value = []
         has_id = attrs and 'id' in attrs
         final_attrs = self.build_attrs(attrs, name=name)
         output = [u'<ul class="undecorated_list" style="margin-left: 5px; margin-top: 3px; margin-bottom: 3px;">']

apps/common/wizard.py

@@ -1,4 +1,4 @@
-'''Common abstract classes for forms.'''
+"""Common abstract classes for forms."""
 try:
     import cPickle as pickle
 except ImportError:
@@ -15,13 +15,13 @@ __all__ = ('security_hash', 'BoundFormWizard')
 
 
 def security_hash_new(form, exclude=None, *args):
-    '''
+    """
     Calculates a security hash for the given Form/FormSet instance.
 
     This creates a list of the form field names/values in a deterministic
     order, pickles the result with the SECRET_KEY setting, then takes an md5
     hash of that.
-    '''
+    """
 
     data = []
     if exclude is None:
@@ -52,19 +52,19 @@ def security_hash_new(form, exclude=None, *args):
 
 
 class BoundFormWizard(FormWizard):
-    '''
+    """
     Render prev_fields as a list of bound form fields in the template
     context rather than raw html.
-    '''
+    """
 
     def security_hash(self, request, form):
-        '''
+        """
         Calculates the security hash for the given HttpRequest and
         Form/FormSet instances.
 
         Subclasses may want to take into account request-specific information,
         such as the IP address.
-        '''
+        """
 
         return security_hash_new(form)
 

apps/converter/api.py

@@ -15,7 +15,7 @@ from .literals import (TRANSFORMATION_CHOICES, TRANSFORMATION_RESIZE,
     FILE_FORMATS)
 from .utils import cleanup
 from .runtime import office_converter
-from .exceptions import OfficeConversionError
+from .exceptions import OfficeConversionError, UnknownFileFormat
 
 HASH_FUNCTION = lambda x: hashlib.sha256(x).hexdigest()
 
@@ -131,4 +131,3 @@ def get_available_transformations_choices():
 
 def get_format_list():
     return [(format, FILE_FORMATS.get(format, u'')) for format in backend.get_format_list()]
-        

apps/converter/exceptions.py

@@ -1,29 +1,29 @@
 class ConvertError(Exception):
-    '''
+    """
     Base exception for all coverter app exceptions
-    '''
+    """
     pass
 
 
 class UnknownFileFormat(ConvertError):
-    '''
+    """
     Raised when the converter backend can't understand a file
-    '''
+    """
     pass
 
 
 class IdentifyError(ConvertError):
-    '''
+    """
     Raised by the graphcismagick and imagemagics identify program
-    '''
+    """
     pass
 
 
 class UnkownConvertError(ConvertError):
-    '''
+    """
     Raised when an error is found but there is no disernible way to
     identify the kind of error
-    '''
+    """
     pass
 
 

apps/converter/tests.py

@@ -20,4 +20,3 @@ Another way to test that 1 + 1 is equal to 2.
 >>> 1 + 1 == 2
 True
 """}
-

apps/django_gpg/__init__.py

@@ -2,10 +2,7 @@ from __future__ import absolute_import
 
 from django.utils.translation import ugettext_lazy as _
 
-from navigation.api import (register_links, register_top_menu,
+from navigation.api import register_links
-    register_model_list_columns, register_multi_item_links,
-    register_sidebar_template)
-from main.api import register_diagnostic, register_maintenance_links
 from project_setup.api import register_setup
 from hkp import Key as KeyServerKey
 

apps/django_gpg/api.py

@@ -1,15 +1,10 @@
 from __future__ import absolute_import
 
-import types
-
-from pickle import dumps
 import logging
 import tempfile
 import os
 
-from django.core.files.base import File
 from django.utils.translation import ugettext_lazy as _
-from django.utils.http import urlquote_plus
 
 from hkp import KeyServer
 import gnupg
@@ -110,7 +105,7 @@ class Key(object):
         keys = gpg.gpg.list_keys(secret=secret)
         key = next((key for key in keys if key['keyid'] == key_id), None)
         if not key:
-            if search_keyservers and secret==False:
+            if search_keyservers and secret == False:
                 try:
                     gpg.receive_key(key_id)
                     return Key(gpg, key_id)

apps/django_gpg/forms.py

@@ -1,9 +1,6 @@
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext
-from django.core.urlresolvers import reverse
-from django.utils.safestring import mark_safe
-from django.conf import settings
 
 
 class KeySearchForm(forms.Form):

apps/django_gpg/models.py

@@ -1 +0,0 @@
-

apps/django_gpg/views.py

@@ -1,21 +1,15 @@
 from __future__ import absolute_import
 
-from datetime import datetime
 import logging
 
 from django.utils.translation import ugettext_lazy as _
 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.contrib import messages
-from django.core.urlresolvers import reverse
-from django.utils.safestring import mark_safe
-from django.conf import settings
-from django.template.defaultfilters import force_escape
 
 from permissions.models import Permission
-from common.utils import pretty_size, parse_range, urlquote, \
+from common.utils import (urlquote, encapsulate)
-    return_diff, encapsulate
 
 from .api import Key, SIGNATURE_STATES
 from .runtime import gpg

apps/document_acls/__init__.py

@@ -1,8 +1,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 from documents.models import Document
-from navigation.api import register_links, register_multi_item_links
+from navigation.api import register_links
-from project_setup.api import register_setup
 from acls import ACLS_VIEW_ACL, ACLS_EDIT_ACL
 from acls.api import class_permissions
 

apps/document_acls/views.py

@@ -1,17 +1,16 @@
-from django.shortcuts import render_to_response, get_object_or_404
+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
-from acls.models import AccessEntry
 
 
 def document_acl_list(request, document_id):
-	document = get_object_or_404(Document, pk=document_id)
+    document = get_object_or_404(Document, pk=document_id)
-	return acl_list_for(
+    return acl_list_for(
-		request,
+        request,
-		document,
+        document,
-		extra_context={
+        extra_context={
-			'object': document,
+            'object': document,
-		}
+        }
-	)
+    )

apps/document_comments/__init__.py

@@ -6,7 +6,6 @@ from django.contrib.comments.models import Comment
 from django.contrib.contenttypes import generic
 
 from navigation.api import register_links, register_model_list_columns
-from permissions.models import PermissionNamespace, Permission
 from common.utils import encapsulate
 from acls.api import class_permissions
 from documents.models import Document

apps/document_indexing/os_specifics.py

@@ -6,16 +6,16 @@ from .conf.settings import SUFFIX_SEPARATOR
 
 
 def assemble_suffixed_filename(filename, suffix=0):
-    '''
+    """
     Split document filename, to attach suffix to the name part then
     re attacht the extension
-    '''
+    """
 
     if suffix:
         name, extension = filename.split(os.split(os.extsep))
         return SUFFIX_SEPARATOR.join([name, unicode(suffix), os.extsep, extension])
     else:
-        return file_filename
+        return filename
 
 
 def assemble_path_from_list(directory_list):

apps/document_indexing/tests.py

@@ -20,4 +20,3 @@ Another way to test that 1 + 1 is equal to 2.
 >>> 1 + 1 == 2
 True
 """}
-

apps/document_indexing/views.py

@@ -59,7 +59,7 @@ def index_instance_list(request, index_id=None):
             },
             {
                 'name': _(u'items'),
-                'attribute': encapsulate(lambda x: x.documents.count() if x.index.link_documents else x.get_children().count() )
+                'attribute': encapsulate(lambda x: x.documents.count() if x.index.link_documents else x.get_children().count())
             }
         ],
         'title': title,

apps/document_signatures/migrations/0002_move_signatures_to_new_app.py

@@ -23,14 +23,10 @@ class Migration(DataMigration):
 
     def backwards(self, orm):
         for document_signature in orm.DocumentVersionSignature.objects.all():
-            try:
+            document_version = document_signature.document_version
-                document_version = orm['documents.DocumentVersion'].objects.get(document_version=document_version)
+            document_version.signature_state=document_signature.signature_state
-            except orm['documents.DocumentVersion'].DoesNotExists:
+            document_version.signature_file=document_signature.signature_file
-                pass
+            document_version.save()
-            else:
-                document_version.signature_state=document_signature.signature_state
-                document_version.signature_file=document_signature.signature_file
-                document_version.save()
 
 
     models = {

apps/document_signatures/models.py

@@ -14,9 +14,9 @@ logger = logging.getLogger(__name__)
 
 
 class DocumentVersionSignature(models.Model):
-    '''
+    """
     Model that describes a document version signature properties
-    '''
+    """
     document_version = models.ForeignKey(DocumentVersion, verbose_name=_(u'document version'), editable=False)
     signature_file = models.FileField(blank=True, null=True, upload_to=get_filename_from_uuid, storage=STORAGE_BACKEND(), verbose_name=_(u'signature file'), editable=False)
     has_embedded_signature = models.BooleanField(default=False, verbose_name=_(u'has embedded signature'), editable=False)

apps/documents/__init__.py

@@ -34,6 +34,8 @@ from .conf import settings as document_settings
 from .widgets import document_thumbnail
 
 # Document page links expressions
+
+
 def is_first_page(context):
     return context['page'].page_number <= 1
 
@@ -179,7 +181,7 @@ register_top_menu(
         r'^documents/[^t]', r'^metadata/[^s]', r'comments', r'tags/document', r'grouping/[^s]', r'history/list/for_object/documents'
     ],
     #children_view_regex=[r'upload'],
-    children_views=['document_folder_list', 'folder_add_document', 'document_index_list', 'upload_version',],
+    children_views=['document_folder_list', 'folder_add_document', 'document_index_list', 'upload_version', ],
     position=1
 )
 

apps/documents/forms.py

@@ -5,12 +5,10 @@ from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext
 from django.core.urlresolvers import reverse
 from django.utils.safestring import mark_safe
-from django.conf import settings
 
 from common.forms import DetailForm
 from common.literals import PAGE_SIZE_CHOICES, PAGE_ORIENTATION_CHOICES
-from common.conf.settings import DEFAULT_PAPER_SIZE
+from common.conf.settings import DEFAULT_PAPER_SIZE, DEFAULT_PAGE_ORIENTATION
-from common.conf.settings import DEFAULT_PAGE_ORIENTATION
 from common.widgets import TextAreaDiv
 
 from .models import (Document, DocumentType,
@@ -19,6 +17,7 @@ from .models import (Document, DocumentType,
 from .widgets import document_html_widget
 from .literals import (RELEASE_LEVEL_FINAL, RELEASE_LEVEL_CHOICES)
 
+
 # Document page forms
 class DocumentPageTransformationForm(forms.ModelForm):
     class Meta:
@@ -197,7 +196,7 @@ class DocumentForm(forms.ModelForm):
             label=_(u'Release level serial'),
             initial=0,
             widget=forms.widgets.TextInput(
-                attrs = {'style': 'width: auto;'}
+                attrs={'style': 'width: auto;'}
             ),
         )
 
@@ -223,6 +222,7 @@ class DocumentForm(forms.ModelForm):
         # Always return the full collection of cleaned data.
         return cleaned_data
 
+
 class DocumentForm_edit(DocumentForm):
     """
     Form sub classes from DocumentForm used only when editing a document

apps/documents/managers.py

@@ -4,7 +4,6 @@ from ast import literal_eval
 from datetime import datetime
 
 from django.db import models
-from django.contrib.auth.models import AnonymousUser
 
 from .conf.settings import RECENT_COUNT
 

apps/documents/models.py

@@ -30,7 +30,7 @@ from converter.literals import (DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION,
     DEFAULT_PAGE_NUMBER)
 
 from .conf.settings import (CHECKSUM_FUNCTION, UUID_FUNCTION,
-    STORAGE_BACKEND, PREVIEW_SIZE, DISPLAY_SIZE, CACHE_PATH,
+    STORAGE_BACKEND, DISPLAY_SIZE, CACHE_PATH,
     ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL)
 from .managers import (RecentDocumentManager,
     DocumentPageTransformationManager)
@@ -70,9 +70,9 @@ class DocumentType(models.Model):
 
 
 class Document(models.Model):
-    '''
+    """
     Defines a single document with it's fields and properties
-    '''
+    """
     uuid = models.CharField(max_length=48, blank=True, editable=False)
     document_type = models.ForeignKey(DocumentType, verbose_name=_(u'document type'), null=True, blank=True)
     description = models.TextField(blank=True, null=True, verbose_name=_(u'description'))
@@ -177,12 +177,12 @@ class Document(models.Model):
             new_version = DocumentVersion(
                 document=self,
                 file=file,
-                major = new_version_dict.get('major'),
+                major=new_version_dict.get('major'),
-                minor = new_version_dict.get('minor'),
+                minor=new_version_dict.get('minor'),
-                micro = new_version_dict.get('micro'),
+                micro=new_version_dict.get('micro'),
-                release_level = release_level,
+                release_level=release_level,
-                serial = serial,
+                serial=serial,
-                comment = comment,
+                comment=comment,
             )
             new_version.save()
         else:
@@ -198,20 +198,20 @@ class Document(models.Model):
 
     # Proxy methods
     def open(self, *args, **kwargs):
-        '''
+        """
         Return a file descriptor to a document's file irrespective of
         the storage backend
-        '''
+        """
         return self.latest_version.open(*args, **kwargs)
 
     def save_to_file(self, *args, **kwargs):
         return self.latest_version.save_to_file(*args, **kwargs)
 
     def exists(self):
-        '''
+        """
         Returns a boolean value that indicates if the document's
         latest version file exists in storage
-        '''
+        """
         return self.latest_version.exists()
 
     # Compatibility methods
@@ -275,9 +275,9 @@ class Document(models.Model):
 
 
 class DocumentVersion(models.Model):
-    '''
+    """
     Model that describes a document version and its properties
-    '''
+    """
     _pre_open_hooks = {}
     _post_save_hooks = {}
 
@@ -344,9 +344,9 @@ class DocumentVersion(models.Model):
             }
 
     def get_formated_version(self):
-        '''
+        """
         Return the formatted version information
-        '''
+        """
         vers = [u'%i.%i' % (self.major, self.minor), ]
 
         if self.micro:
@@ -360,10 +360,10 @@ class DocumentVersion(models.Model):
         return self.documentpage_set
 
     def save(self, *args, **kwargs):
-        '''
+        """
         Overloaded save method that updates the document version's checksum,
         mimetype, page count and transformation when created
-        '''
+        """
         new_document = not self.pk
         if not self.pk:
             self.timestamp = datetime.datetime.now()
@@ -385,10 +385,10 @@ class DocumentVersion(models.Model):
                 self.apply_default_transformations(transformations)
 
     def update_checksum(self, save=True):
-        '''
+        """
         Open a document version's file and update the checksum field using the
         user provided checksum function
-        '''
+        """
         if self.exists():
             source = self.open()
             self.checksum = unicode(CHECKSUM_FUNCTION(source.read()))
@@ -444,17 +444,17 @@ class DocumentVersion(models.Model):
                     page_transformation.save()
 
     def revert(self):
-        '''
+        """
         Delete the subsequent versions after this one
-        '''
+        """
         for version in self.document.versions.filter(timestamp__gt=self.timestamp):
             version.delete()
 
     def update_mimetype(self, save=True):
-        '''
+        """
         Read a document verions's file and determine the mimetype by calling the
         get_mimetype wrapper
-        '''
+        """
         if self.exists():
             try:
                 self.mimetype, self.encoding = get_mimetype(self.open(), self.filename)
@@ -470,17 +470,17 @@ class DocumentVersion(models.Model):
         return super(DocumentVersion, self).delete(*args, **kwargs)
 
     def exists(self):
-        '''
+        """
         Returns a boolean value that indicates if the document's file
         exists in storage
-        '''
+        """
         return self.file.storage.exists(self.file.path)
 
     def open(self, raw=False):
-        '''
+        """
         Return a file descriptor to a document version's file irrespective of
         the storage backend
-        '''
+        """
         if raw:
             return self.file.storage.open(self.file.path)
         else:
@@ -491,10 +491,10 @@ class DocumentVersion(models.Model):
             return result
 
     def save_to_file(self, filepath, buffer_size=1024 * 1024):
-        '''
+        """
         Save a copy of the document from the document storage backend
         to the local filesystem
-        '''
+        """
         input_descriptor = self.open()
         output_descriptor = open(filepath, 'wb')
         while True:
@@ -517,10 +517,10 @@ class DocumentVersion(models.Model):
 
 
 class DocumentTypeFilename(models.Model):
-    '''
+    """
     List of filenames available to a specific document type for the
     quick rename functionality
-    '''
+    """
     document_type = models.ForeignKey(DocumentType, verbose_name=_(u'document type'))
     filename = models.CharField(max_length=128, verbose_name=_(u'filename'), db_index=True)
     enabled = models.BooleanField(default=True, verbose_name=_(u'enabled'))
@@ -535,9 +535,9 @@ class DocumentTypeFilename(models.Model):
 
 
 class DocumentPage(models.Model):
-    '''
+    """
     Model that describes a document version page including it's content
-    '''
+    """
     # New parent field
     document_version = models.ForeignKey(DocumentVersion, verbose_name=_(u'document version'))
 

apps/documents/tests.py

@@ -3,7 +3,6 @@ from __future__ import absolute_import
 import os
 
 from django.utils import unittest
-from django.test.client import Client
 from django.conf import settings
 from django.core.files.base import File
 
@@ -19,8 +18,8 @@ class DocumentTestCase(unittest.TestCase):
         self.document_type.save()
 
         self.document = Document(
-            document_type = self.document_type,
+            document_type=self.document_type,
-            description = 'description',
+            description='description',
         )
         self.document.save()
         #return File(file(self.filepath, 'rb'), name=self.filename)
@@ -82,6 +81,5 @@ class DocumentTestCase(unittest.TestCase):
         self.failUnlessEqual(self.document.has_detached_signature(), True)
         self.failUnlessEqual(self.document.verify_signature().status, SIGNATURE_STATE_VALID)
 
-        
     def tearDown(self):
         self.document.delete()

apps/documents/views.py

@@ -386,6 +386,7 @@ def document_multiple_download(request):
         request, document_id_list=request.GET.get('id_list', [])
     )
 
+
 def document_page_transformation_list(request, document_page_id):
     document_page = get_object_or_404(DocumentPage, pk=document_page_id)
 
@@ -394,7 +395,6 @@ def document_page_transformation_list(request, document_page_id):
     except PermissionDenied:
         AccessEntry.objects.check_access(PERMISSION_DOCUMENT_TRANSFORM, request.user, document_page.document)
 
-
     return object_list(
         request,
         queryset=document_page.documentpagetransformation_set.all(),

apps/documents/widgets.py

@@ -6,13 +6,10 @@ from django.utils.translation import ugettext_lazy as _
 from django.core.urlresolvers import reverse
 from django.utils.http import urlencode
 
-from converter.literals import DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION, \
+from converter.literals import (DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION,
-    DEFAULT_PAGE_NUMBER
+    DEFAULT_PAGE_NUMBER)
-from converter.exceptions import UnknownFileFormat, UnkownConvertError
 from mimetype.api import get_error_icon_url
 
-from .conf.settings import DISPLAY_SIZE
-
 
 def document_thumbnail(document):
     return document_html_widget(document, click_view='document_preview')

apps/exporter/models.py

@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.

apps/exporter/tests.py

@@ -1,16 +0,0 @@
-"""
-This file demonstrates writing tests using the unittest module. These will pass
-when you run "manage.py test".
-
-Replace this with more appropriate tests for your application.
-"""
-
-from django.test import TestCase
-
-
-class SimpleTest(TestCase):
-    def test_basic_addition(self):
-        """
-        Tests that 1 + 1 always equals 2.
-        """
-        self.assertEqual(1 + 1, 2)

apps/exporter/urls.py

@@ -1,5 +0,0 @@
-from django.conf.urls.defaults import patterns, url
-
-urlpatterns = patterns('exporter.views',
-    url(r'^export_test/$', 'export_test', (), 'export_test'),
-)

apps/exporter/views.py

@@ -1,150 +0,0 @@
-import os
-import hashlib
-
-from django.utils import simplejson
-from django.http import HttpResponse
-from django.template.defaultfilters import slugify
-
-from documents.models import Document, DocumentType
-from metadata.models import MetadataType, MetadataSet
-
-FORMAT_VERSION = 1.0
-HASH_FUNCTION = lambda x: hashlib.sha256(x).hexdigest()
-
-
-def get_hash(obj):
-    if obj:
-        return u'%s_%s' % (HASH_FUNCTION(unicode(obj)), slugify(unicode(obj)))
-    else:
-        return None
-
-
-'''
-
-
-comments
-tags
-folders    
-
-pages
-pages transformation
-metadata
-doc_type metadata
-
-sources
-sources transform
-
-users
-
-class DocumentTypeDefaults(models.Model):
-    """
-    Default preselected metadata types and metadata set per document
-    type
-    """    
-    document_type = models.ForeignKey(DocumentType, verbose_name=_(u'document type'))
-    default_metadata_sets = models.ManyToManyField(MetadataSet, blank=True, verbose_name=_(u'default metadata sets'))
-    default_metadata = models.ManyToManyField(MetadataType, blank=True, verbose_name=_(u'default metadata'))
-
-
-'''
-
-def export_test(request):
-    big_list = []
-    big_list.append({'version': FORMAT_VERSION})
-    
-    for metadata_type in MetadataType.objects.all():
-        big_list.append(
-            {
-                'metadata_types': [
-                    {
-                        'id': get_hash(metadata_type.name),
-                        'name': metadata_type.name,
-                        'title': metadata_type.title,
-                        'default': metadata_type.default,
-                        'lookup': metadata_type.lookup,
-                    }
-                ]
-            }
-        )    
-
-    for metadata_set in MetadataSet.objects.all():
-        big_list.append(
-            {
-                'metadata_sets': [
-                    {
-                        'id': get_hash(metadata_set.title),
-                        'name': metadata_set.title,
-                        'metadata_types': [
-                            {
-                                'id': get_hash(metadata_type),
-                            }
-                            for metadata_type in metadata_set.metadatasetitem_set.all()
-                        ]
-                    }
-                ]
-            }
-        )
-    
-    
-    for document_type in DocumentType.objects.all():
-        big_list.append(
-            {
-                'document_types': [
-                    {
-                        'id': get_hash(document_type.name),
-                        'name': document_type.name,
-                        'filenames': [
-                            {
-                                'filename': doc_type_filename.filename,
-                                'enabled': doc_type_filename.enabled,
-                            }
-                            for doc_type_filename in document_type.documenttypefilename_set.all()
-                        ],
-                        'metadata_defaults': [
-                            {
-                                'default_metadata': [get_hash(metadata_type.name) for metadata_type in doc_type_defaults.default_metadata.all()],
-                                'default_metadata_sets': [get_hash(metadata_set.title) for metadata_set in doc_type_defaults.default_metadata_sets.all()],
-                            }
-                            for doc_type_defaults in document_type.documenttypedefaults_set.all()
-                        ]
-                    }
-                ]
-            }
-        )
-    
-    for document in Document.objects.all()[:10]:
-        big_list.append(
-            {
-                'documents': [
-                    {
-                        'document_type': get_hash(document.document_type),
-                        'filename': os.extsep.join([document.file_filename, document.file_extension]),
-                        #'date_added'
-                        'uuid': document.uuid,
-                        'description': unicode(document.description) if document.description else None,
-                        'tags': [get_hash(tag) for tag in document.tags.all()],
-                        'folders': [get_hash(folder_document.folder) for folder_document in document.folderdocument_set.all()],
-                        'comments': [
-                            {
-                                'comment': comment.comment,
-                                'user': unicode(comment.user),
-                                'submit_date': unicode(comment.submit_date),
-                            }
-                            for comment in document.comments.all()
-                        ],
-                        'versions': [
-                            {
-                                1.0: {
-                                    'mimetype': document.file_mimetype,
-                                    'encoding': document.file_mime_encoding,
-                                    #'date_updated'
-                                    'checksum': document.checksum,
-                                }
-                            }
-                        ]
-                    }
-                ]
-            }
-        )
-    
-    return HttpResponse(simplejson.dumps(big_list, indent=4, ensure_ascii=True), mimetype='application/json')

apps/folders/tests.py

@@ -1,23 +0,0 @@
-"""
-This file demonstrates two different styles of tests (one doctest and one
-unittest). These will both pass when you run "manage.py test".
-
-Replace these with more appropriate tests for your application.
-"""
-
-from django.test import TestCase
-
-class SimpleTest(TestCase):
-    def test_basic_addition(self):
-        """
-        Tests that 1 + 1 always equals 2.
-        """
-        self.failUnlessEqual(1 + 1, 2)
-
-__test__ = {"doctest": """
-Another way to test that 1 + 1 is equal to 2.
-
->>> 1 + 1 == 2
-True
-"""}
-

apps/folders/views.py

@@ -7,7 +7,6 @@ from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.contrib import messages
-from django.views.generic.list_detail import object_list
 from django.core.urlresolvers import reverse
 from django.core.exceptions import PermissionDenied
 
@@ -19,7 +18,7 @@ from common.utils import encapsulate
 from acls.models import AccessEntry
 from acls.views import acl_list_for
 
-from .models import Folder, FolderDocument
+from .models import Folder
 from .forms import FolderForm, FolderListForm
 from .permissions import (PERMISSION_FOLDER_CREATE,
     PERMISSION_FOLDER_EDIT, PERMISSION_FOLDER_DELETE,
@@ -194,7 +193,6 @@ def folder_add_document(request, document_id):
     else:
         form = FolderListForm(user=request.user)
 
-
     return render_to_response('generic_form.html', {
         'title': _(u'add document "%s" to a folder') % document,
         'form': form,

apps/linking/views.py

@@ -9,7 +9,7 @@ from django.shortcuts import get_object_or_404, render_to_response
 from django.core.urlresolvers import reverse
 from django.template import RequestContext
 
-from common.utils import generate_choices_w_labels, encapsulate
+from common.utils import encapsulate
 from common.widgets import two_state_template
 from documents.models import Document
 from documents.views import document_list

apps/lock_manager/managers.py

@@ -3,7 +3,6 @@ from __future__ import absolute_import
 import logging
 import datetime
 
-from django.db.utils import DatabaseError
 from django.db.utils import IntegrityError
 from django.db import transaction
 from django.db import models

apps/lock_manager/models.py

@@ -21,7 +21,7 @@ class Lock(models.Model):
 
     def save(self, *args, **kwargs):
         self.creation_datetime = datetime.datetime.now()
-        if not self.timeout and not kwarget.get('timeout'):
+        if not self.timeout and not kwargs.get('timeout'):
             self.timeout = DEFAULT_LOCK_TIMEOUT
 
         super(Lock, self).save(*args, **kwargs)

apps/main/tests.py

@@ -20,4 +20,3 @@ Another way to test that 1 + 1 is equal to 2.
 >>> 1 + 1 == 2
 True
 """}
-

apps/metadata/api.py

@@ -1,4 +1,4 @@
-'''Metadata handling commonalities'''
+"""Metadata handling commonalities"""
 from __future__ import absolute_import
 
 from urllib import unquote_plus
@@ -9,9 +9,9 @@ from .models import DocumentMetadata, MetadataType
 
 
 def decode_metadata_from_url(url_dict):
-    '''
+    """
     Parse a URL query string to a list of metadata
-    '''
+    """
     metadata_dict = {
         'id': {},
         'value': {}
@@ -35,19 +35,19 @@ def decode_metadata_from_url(url_dict):
 
 
 def save_metadata_list(metadata_list, document, create=False):
-    '''
+    """
     Take a list of metadata dictionaries and associate them to a
     document
-    '''
+    """
     for item in metadata_list:
         save_metadata(item, document, create)
 
 
 def save_metadata(metadata_dict, document, create=False):
-    '''
+    """
     Take a dictionary of metadata type & value and associate it to a
     document
-    '''
+    """
     if create:
         # Use matched metadata now to create document metadata
         document_metadata, created = DocumentMetadata.objects.get_or_create(
@@ -81,16 +81,16 @@ def save_metadata(metadata_dict, document, create=False):
 
 
 def metadata_repr(metadata_list):
-    '''
+    """
     Return a printable representation of a metadata list
-    '''
+    """
     return u', '.join(metadata_repr_as_list(metadata_list))
 
 
 def metadata_repr_as_list(metadata_list):
-    '''
+    """
     Turn a list of metadata into a list of printable representations
-    '''
+    """
     output = []
     for metadata_dict in metadata_list:
         try:
@@ -103,7 +103,7 @@ def metadata_repr_as_list(metadata_list):
 
 
 def get_metadata_string(document):
-    '''
+    """
     Return a formated representation of a document's metadata values
-    '''
+    """
     return u', '.join([u'%s - %s' % (metadata.metadata_type, metadata.value) for metadata in DocumentMetadata.objects.filter(document=document).select_related('metadata_type')])

apps/metadata/models.py

@@ -12,9 +12,9 @@ available_functions_string = (_(u' Available functions: %s') % u','.join([u'%s()
 
 
 class MetadataType(models.Model):
-    '''
+    """
     Define a type of metadata
-    '''    
+    """
     name = models.CharField(unique=True, max_length=48, verbose_name=_(u'name'), help_text=_(u'Do not use python reserved words, or spaces.'))
     title = models.CharField(max_length=48, verbose_name=_(u'title'), blank=True, null=True)
     default = models.CharField(max_length=128, blank=True, null=True,
@@ -35,9 +35,9 @@ class MetadataType(models.Model):
 
 
 class MetadataSet(models.Model):
-    '''
+    """
     Define a group of metadata types
-    '''
+    """
     title = models.CharField(max_length=48, verbose_name=_(u'title'))
 
     def __unicode__(self):
@@ -50,10 +50,10 @@ class MetadataSet(models.Model):
 
 
 class MetadataSetItem(models.Model):
-    '''
+    """
     Define the set of metadata that relates to a set or group of
     metadata fields
-    '''
+    """
     metadata_set = models.ForeignKey(MetadataSet, verbose_name=_(u'metadata set'))
     metadata_type = models.ForeignKey(MetadataType, verbose_name=_(u'metadata type'))
     #required = models.BooleanField(default=True, verbose_name=_(u'required'))
@@ -67,10 +67,10 @@ class MetadataSetItem(models.Model):
 
 
 class DocumentMetadata(models.Model):
-    '''
+    """
     Link a document to a specific instance of a metadata type with it's
     current value
-    '''
+    """
     document = models.ForeignKey(Document, verbose_name=_(u'document'))
     metadata_type = models.ForeignKey(MetadataType, verbose_name=_(u'type'))
     value = models.CharField(max_length=256, blank=True, verbose_name=_(u'value'), db_index=True)
@@ -84,10 +84,10 @@ class DocumentMetadata(models.Model):
 
 
 class DocumentTypeDefaults(models.Model):
-    '''
+    """
     Default preselected metadata types and metadata set per document
     type
-    '''    
+    """
     document_type = models.ForeignKey(DocumentType, verbose_name=_(u'document type'))
     default_metadata_sets = models.ManyToManyField(MetadataSet, blank=True, verbose_name=_(u'default metadata sets'))
     default_metadata = models.ManyToManyField(MetadataType, blank=True, verbose_name=_(u'default metadata'))

apps/metadata/tests.py

@@ -20,4 +20,3 @@ Another way to test that 1 + 1 is equal to 2.
 >>> 1 + 1 == 2
 True
 """}
-

apps/navigation/api.py

@@ -1,5 +1,3 @@
-import copy
-
 object_navigation = {}
 multi_object_navigation = {}
 model_list_columns = {}

apps/navigation/widgets.py

@@ -8,13 +8,11 @@ from django.utils.translation import ugettext_lazy as _
 from django.core.urlresolvers import reverse
 from django.template.defaultfilters import capfirst
 from django.core.exceptions import PermissionDenied
-from django.template import RequestContext
+from django.template import RequestContext, Variable
-from django.template import (TemplateSyntaxError, Library,
-    VariableDoesNotExist, Node, Variable)
 
 from permissions.models import Permission
 
-from .templatetags.navigation_tags import resolve_links, _get_object_navigation_links
+from .templatetags.navigation_tags import resolve_links
 from .utils import resolve_to_name
 
 
@@ -28,6 +26,7 @@ def button_navigation_widget(request, link):
     else:
         return render_widget(request, link)
 
+
 def render_widget(request, link):
     context = RequestContext(request)
 

apps/ocr/__init__.py

@@ -8,8 +8,7 @@ from django.utils.translation import ugettext
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 
-from navigation.api import register_links, register_top_menu, register_multi_item_links
+from navigation.api import register_links, register_multi_item_links
-from permissions.models import Permission, PermissionNamespace
 from documents.models import Document, DocumentVersion
 from main.api import register_maintenance_links
 from project_tools.api import register_tool
@@ -18,11 +17,12 @@ from acls.api import class_permissions
 from scheduler.api import register_interval_job
 
 from .conf.settings import (AUTOMATIC_OCR, QUEUE_PROCESSING_INTERVAL)
-from .models import DocumentQueue, QueueTransformation, QueueDocument
+from .models import DocumentQueue, QueueTransformation
 from .tasks import task_process_document_queues
 from .permissions import (PERMISSION_OCR_DOCUMENT,
     PERMISSION_OCR_DOCUMENT_DELETE, PERMISSION_OCR_QUEUE_ENABLE_DISABLE,
-    PERMISSION_OCR_CLEAN_ALL_PAGES, PERMISSION_OCR_QUEUE_EDIT)
+    PERMISSION_OCR_CLEAN_ALL_PAGES)
+from .exceptions import AlreadyQueued
 
 logger = logging.getLogger(__name__)
 
@@ -77,7 +77,10 @@ def document_post_save(sender, instance, **kwargs):
     logger.debug('instance: %s' % instance)
     if kwargs.get('created', False):
         if AUTOMATIC_OCR:
-            DocumentQueue.objects.queue_document(instance.document)
+			try:
+				DocumentQueue.objects.queue_document(instance.document)
+			except AlreadyQueued:
+				pass
 
 
 # Disabled because it appears Django execute signals using the same

apps/ocr/conf/settings.py

@@ -14,7 +14,6 @@ register_settings(
         {'name': u'NODE_CONCURRENT_EXECUTION', 'global_name': u'OCR_NODE_CONCURRENT_EXECUTION', 'default': 1, 'description': _(u'Maximum amount of concurrent document OCRs a node can perform.')},
         {'name': u'AUTOMATIC_OCR', 'global_name': u'OCR_AUTOMATIC_OCR', 'default': False, 'description': _(u'Automatically queue newly created documents for OCR.')},
         {'name': u'QUEUE_PROCESSING_INTERVAL', 'global_name': u'OCR_QUEUE_PROCESSING_INTERVAL', 'default': 10},
-        {'name': u'CACHE_URI', 'global_name': u'OCR_CACHE_URI', 'default': None, 'description': _(u'URI in the form: "memcached://127.0.0.1:11211/" to specify a cache backend to use for locking. Multiple hosts can be specified separated by a semicolon.')},
         {'name': u'UNPAPER_PATH', 'global_name': u'OCR_UNPAPER_PATH', 'default': u'/usr/bin/unpaper', 'description': _(u'File path to unpaper program.'), 'exists': True},
     ]
 )

apps/ocr/exceptions.py

@@ -1,21 +1,21 @@
 class AlreadyQueued(Exception):
-    '''
+    """
     Raised when a trying to queue document already in the queue
-    '''    
+    """
     pass
 
 
 class TesseractError(Exception):
-    '''
+    """
     Raised by tesseract
-    '''    
+    """
     pass
 
 
 class UnpaperError(Exception):
-    '''
+    """
     Raised by unpaper
-    '''
+    """
     pass
 
 

apps/ocr/parsers/__init__.py

@@ -3,10 +3,9 @@ import logging
 
 from django.utils.translation import ugettext as _
 
-from converter import office_converter
 from converter import office_converter
 from converter.office_converter import OfficeConverter
-from converter.exceptions import OfficeBackendError, OfficeConversionError
+from converter.exceptions import OfficeConversionError
 from documents.utils import document_save_to_temp_dir
 
 from ocr.parsers.exceptions import ParserError, ParserUnknownFile

apps/ocr/tasks.py

@@ -2,8 +2,6 @@ from __future__ import absolute_import
 
 from datetime import timedelta, datetime
 import platform
-from time import sleep
-from random import random
 import logging
 
 from django.db.models import Q
@@ -17,7 +15,7 @@ from .literals import (QUEUEDOCUMENT_STATE_PENDING,
     QUEUEDOCUMENT_STATE_ERROR)
 from .models import QueueDocument, DocumentQueue
 from .conf.settings import (NODE_CONCURRENT_EXECUTION, REPLICATION_DELAY,
-    CACHE_URI, QUEUE_PROCESSING_INTERVAL)
+    QUEUE_PROCESSING_INTERVAL)
 
 LOCK_EXPIRE = 60 * 10  # Lock expires in 10 minutes
 # TODO: Tie LOCK_EXPIRATION with hard task timeout
@@ -49,37 +47,9 @@ def task_process_queue_document(queue_document_id):
         pass
 
 
-def reset_orphans():
-    pass
-    '''
-    i = inspect().active()
-    active_tasks = []
-    orphans = []
-
-    if i:
-        for host, instances in i.items():
-            for instance in instances:
-                active_tasks.append(instance['id'])
-
-    for document_queue in DocumentQueue.objects.filter(state=DOCUMENTQUEUE_STATE_ACTIVE):
-        orphans = document_queue.queuedocument_set.\
-            filter(state=QUEUEDOCUMENT_STATE_PROCESSING).\
-            exclude(result__in=active_tasks)
-
-    for orphan in orphans:
-        orphan.result = _(u'Orphaned')
-        orphan.state = QUEUEDOCUMENT_STATE_PENDING
-        orphan.delay = False
-        orphan.node_name = None
-        orphan.save()
-    '''
-
-
 def task_process_document_queues():
     logger.debug('executed')
-    # reset_orphans()
+    # TODO: reset_orphans()
-    # Causes problems with big clusters increased latency
-    # Disabled until better solution
     q_pending = Q(state=QUEUEDOCUMENT_STATE_PENDING)
     q_delayed = Q(delay=True)
     q_delay_interval = Q(datetime_submitted__lt=datetime.now() - timedelta(seconds=REPLICATION_DELAY))
@@ -100,7 +70,7 @@ def task_process_document_queues():
                 #print 'DocumentQueueWatcher exception: %s' % e
             finally:
                 # Don't process anymore from this queryset, might be stale
-                break;
+                break
         else:
             logger.debug('already processing maximun')
     else:

apps/ocr/tests.py

@@ -20,4 +20,3 @@ Another way to test that 1 + 1 is equal to 2.
 >>> 1 + 1 == 2
 True
 """}
-

apps/permissions/api.py

@@ -1 +0,0 @@
-

apps/permissions/models.py

@@ -141,23 +141,23 @@ class StoredPermission(models.Model):
     def get_holders(self):
         return [holder.holder_object for holder in self.permissionholder_set.all()]
 
-    def requester_has_this(self, requester):
+    def requester_has_this(self, actor):
-        requester = AnonymousUserSingleton.objects.passthru_check(requester)
+        actor = AnonymousUserSingleton.objects.passthru_check(actor)
-        logger.debug('requester: %s' % requester)
+        logger.debug('actor: %s' % actor)
-        if isinstance(requester, User):
+        if isinstance(actor, User):
-            if requester.is_superuser or requester.is_staff:
+            if actor.is_superuser or actor.is_staff:
                 return True
 
         # Request is one of the permission's holders?
-        if requester in self.get_holders():
+        if actor in self.get_holders():
             return True
 
         # If not check if the requesters memberships objects is one of
         # the permission's holder?
-        roles = RoleMember.objects.get_roles_for_member(requester)
+        roles = RoleMember.objects.get_roles_for_member(actor)
 
-        if isinstance(requester, User):
+        if isinstance(actor, User):
-            groups = requester.groups.all()
+            groups = actor.groups.all()
         else:
             groups = []
 
@@ -168,15 +168,15 @@ class StoredPermission(models.Model):
         logger.debug('Fallthru')
         return False
 
-    def grant_to(self, requester):
+    def grant_to(self, actor):
-        requester = AnonymousUserSingleton.objects.passthru_check(requester)
+        actor = AnonymousUserSingleton.objects.passthru_check(actor)
-        permission_holder, created = PermissionHolder.objects.get_or_create(permission=self, holder_type=ContentType.objects.get_for_model(requester), holder_id=requester.pk)
+        permission_holder, created = PermissionHolder.objects.get_or_create(permission=self, holder_type=ContentType.objects.get_for_model(actor), holder_id=actor.pk)
         return created
 
-    def revoke_from(self, holder):
+    def revoke_from(self, actor):
-        requester = AnonymousUserSingleton.objects.passthru_check(requester)
+        actor = AnonymousUserSingleton.objects.passthru_check(actor)
         try:
-            permission_holder = PermissionHolder.objects.get(permission=self, holder_type=ContentType.objects.get_for_model(holder), holder_id=holder.pk)
+            permission_holder = PermissionHolder.objects.get(permission=self, holder_type=ContentType.objects.get_for_model(actor), holder_id=actor.pk)
             permission_holder.delete()
             return True
         except PermissionHolder.DoesNotExist:

apps/permissions/runtime.py

@@ -1 +0,0 @@
-

apps/permissions/tests.py

@@ -20,4 +20,3 @@ Another way to test that 1 + 1 is equal to 2.
 >>> 1 + 1 == 2
 True
 """}
-

apps/smart_settings/__init__.py

@@ -2,6 +2,7 @@ from django.utils.translation import ugettext_lazy as _
 
 from project_setup.api import register_setup
 
+
 def is_superuser(context):
     return context['request'].user.is_staff or context['request'].user.is_superuser
 

apps/smart_settings/tests.py

@@ -20,4 +20,3 @@ Another way to test that 1 + 1 is equal to 2.
 >>> 1 + 1 == 2
 True
 """}
-

apps/sources/__init__.py

@@ -2,15 +2,11 @@ from __future__ import absolute_import
 
 from django.utils.translation import ugettext_lazy as _
 
-from navigation.api import register_links, \
+from navigation.api import (register_links,
-    register_model_list_columns
+    register_model_list_columns)
-from permissions.models import Permission, PermissionNamespace
 from common.utils import encapsulate
 from project_setup.api import register_setup
-from documents.models import Document
+from documents.permissions import PERMISSION_DOCUMENT_NEW_VERSION
-from documents.permissions import (PERMISSION_DOCUMENT_CREATE,
-    PERMISSION_DOCUMENT_NEW_VERSION)
-from acls.api import class_permissions
 
 from .staging import StagingFile
 from .models import (WebForm, StagingFolder, SourceTransformation,

apps/sources/tests.py

@@ -20,4 +20,3 @@ Another way to test that 1 + 1 is equal to 2.
 >>> 1 + 1 == 2
 True
 """}
-

apps/sources/views.py

@@ -26,7 +26,7 @@ from sources.literals import (SOURCE_CHOICE_WEB_FORM, SOURCE_CHOICE_STAGING,
     SOURCE_CHOICE_WATCH)
 from sources.literals import (SOURCE_UNCOMPRESS_CHOICE_Y,
     SOURCE_UNCOMPRESS_CHOICE_ASK)
-from sources.staging import create_staging_file_class, StagingFile
+from sources.staging import create_staging_file_class
 from sources.forms import (StagingDocumentForm, WebFormForm,
     WatchFolderSetupForm)
 from sources.forms import WebFormSetupForm, StagingFolderSetupForm
@@ -75,6 +75,7 @@ def get_active_tab_links(document=None):
         SOURCE_CHOICE_STAGING: staging_folders
     }
 
+
 def upload_interactive(request, source_type=None, source_id=None, document_pk=None):
     subtemplates_list = []
 

apps/tags/forms.py

@@ -18,9 +18,9 @@ logger = logging.getLogger(__name__)
 
 
 class TagForm(forms.Form):
-    '''
+    """
     Form to edit an existing tag's properties
-    '''
+    """
     name = forms.CharField(label=_(u'Name'))
     color = forms.ChoiceField(choices=COLOR_CHOICES, label=_(u'Color'))
 

apps/tags/widgets.py

@@ -3,9 +3,9 @@ from django.utils.safestring import mark_safe
 
 
 def get_tags_inline_widget(document):
-    '''
+    """
     A tag widget that includes the total tag count for a given document
-    '''
+    """
     tags_template = []
     tag_count = document.tags.count()
     if tag_count:
@@ -20,10 +20,10 @@ def get_tags_inline_widget(document):
 
 
 def get_tags_inline_widget_simple(document):
-    '''
+    """
     A tag widget that only displayes the rectangular colored boxes for a
     given document
-    '''
+    """
     tags_template = []
 
     tag_count = document.tags.count()

docs/changelog.rst

@@ -1,5 +1,6 @@
 Version 0.12
 ------------
+* Removal of the OCR_CACHE_URI configuration option
 * Upgrade commands:
 
     * ./manage.py syncdb

docs/settings.rst

@@ -270,14 +270,6 @@ OCR
     Default: ``10``               
 
 
-.. data:: OCR_CACHE_URI    
-    
-    Default: ``None``       
-
-    URI in the form: ``"memcached://127.0.0.1:11211/"`` to specify a cache
-    backend to use for locking. Multiple hosts can be specified separated
-    by a semicolon.    
-    
 
 .. data:: OCR_UNPAPER_PATH