PEP8 cleanups, remove unused imports
This commit is contained in:
@@ -5,7 +5,6 @@ import tempfile
|
|||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.contrib.auth import models as auth_models
|
from django.contrib.auth import models as auth_models
|
||||||
from django.contrib.auth.management import create_superuser
|
from django.contrib.auth.management import create_superuser
|
||||||
from django.db.models import signals
|
|
||||||
from django.dispatch import receiver
|
from django.dispatch import receiver
|
||||||
from django.db.models.signals import post_syncdb
|
from django.db.models.signals import post_syncdb
|
||||||
|
|
||||||
|
|||||||
@@ -120,7 +120,8 @@ class ScrollableCheckboxSelectMultiple(forms.widgets.CheckboxSelectMultiple):
|
|||||||
exceds the height of the div
|
exceds the height of the div
|
||||||
'''
|
'''
|
||||||
def render(self, name, value, attrs=None, choices=()):
|
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
|
has_id = attrs and 'id' in attrs
|
||||||
final_attrs = self.build_attrs(attrs, name=name)
|
final_attrs = self.build_attrs(attrs, name=name)
|
||||||
output = [u'<ul class="undecorated_list" style="margin-left: 5px; margin-top: 3px; margin-bottom: 3px;">']
|
output = [u'<ul class="undecorated_list" style="margin-left: 5px; margin-top: 3px; margin-bottom: 3px;">']
|
||||||
|
|||||||
@@ -2,10 +2,7 @@ from __future__ import absolute_import
|
|||||||
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
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 project_setup.api import register_setup
|
||||||
from hkp import Key as KeyServerKey
|
from hkp import Key as KeyServerKey
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,5 @@
|
|||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
import types
|
|
||||||
|
|
||||||
from pickle import dumps
|
|
||||||
import logging
|
import logging
|
||||||
import tempfile
|
import tempfile
|
||||||
import os
|
import os
|
||||||
|
|||||||
@@ -1,9 +1,6 @@
|
|||||||
from django import forms
|
from django import forms
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.utils.translation import ugettext
|
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):
|
class KeySearchForm(forms.Form):
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
from datetime import datetime
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
@@ -14,8 +13,7 @@ from django.conf import settings
|
|||||||
from django.template.defaultfilters import force_escape
|
from django.template.defaultfilters import force_escape
|
||||||
|
|
||||||
from permissions.models import Permission
|
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 .api import Key, SIGNATURE_STATES
|
||||||
from .runtime import gpg
|
from .runtime import gpg
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ def document_post_save_hook(instance):
|
|||||||
if not instance.pk:
|
if not instance.pk:
|
||||||
document_signature, created = DocumentVersionSignature.objects.get_or_create(
|
document_signature, created = DocumentVersionSignature.objects.get_or_create(
|
||||||
document_version=instance.latest_version,
|
document_version=instance.latest_version,
|
||||||
)
|
)
|
||||||
#DocumentVersionSignature.objects.update_signed_state(instance.document)
|
#DocumentVersionSignature.objects.update_signed_state(instance.document)
|
||||||
|
|
||||||
#@receiver(post_save, dispatch_uid='check_document_signature_state', sender=DocumentVersion)
|
#@receiver(post_save, dispatch_uid='check_document_signature_state', sender=DocumentVersion)
|
||||||
|
|||||||
@@ -13,12 +13,12 @@ class DocumentVersionSignatureManager(models.Manager):
|
|||||||
document_signature, created = self.model.objects.get_or_create(
|
document_signature, created = self.model.objects.get_or_create(
|
||||||
document_version=document.latest_version,
|
document_version=document.latest_version,
|
||||||
)
|
)
|
||||||
|
|
||||||
return document_signature
|
return document_signature
|
||||||
|
|
||||||
def add_detached_signature(self, document, detached_signature):
|
def add_detached_signature(self, document, detached_signature):
|
||||||
document_signature = self.get_document_signature(document)
|
document_signature = self.get_document_signature(document)
|
||||||
|
|
||||||
if document_signature.has_embedded_signature:
|
if document_signature.has_embedded_signature:
|
||||||
raise Exception('document already has an embedded signature')
|
raise Exception('document already has an embedded signature')
|
||||||
else:
|
else:
|
||||||
@@ -27,13 +27,13 @@ class DocumentVersionSignatureManager(models.Manager):
|
|||||||
document_signature.delete_detached_signature()
|
document_signature.delete_detached_signature()
|
||||||
document_signature.signature_file = None
|
document_signature.signature_file = None
|
||||||
document_signature.save()
|
document_signature.save()
|
||||||
|
|
||||||
document_signature.signature_file = detached_signature
|
document_signature.signature_file = detached_signature
|
||||||
document_signature.save()
|
document_signature.save()
|
||||||
|
|
||||||
def has_detached_signature(self, document):
|
def has_detached_signature(self, document):
|
||||||
document_signature = self.get_document_signature(document)
|
document_signature = self.get_document_signature(document)
|
||||||
|
|
||||||
if document_signature.signature_file:
|
if document_signature.signature_file:
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
@@ -48,7 +48,7 @@ class DocumentVersionSignatureManager(models.Manager):
|
|||||||
|
|
||||||
def detached_signature(self, document):
|
def detached_signature(self, document):
|
||||||
document_signature = self.get_document_signature(document)
|
document_signature = self.get_document_signature(document)
|
||||||
|
|
||||||
return document_signature.signature_file.storage.open(document_signature.signature_file.path)
|
return document_signature.signature_file.storage.open(document_signature.signature_file.path)
|
||||||
|
|
||||||
def verify_signature(self, document):
|
def verify_signature(self, document):
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ class DocumentVersionSignature(models.Model):
|
|||||||
|
|
||||||
def save(self, *args, **kwargs):
|
def save(self, *args, **kwargs):
|
||||||
if not self.pk:
|
if not self.pk:
|
||||||
self.has_embedded_signature = gpg.has_embedded_signature(self.document_version.open(raw=True))
|
self.has_embedded_signature = gpg.has_embedded_signature(self.document_version.open(raw=True))
|
||||||
super(DocumentVersionSignature, self).save(*args, **kwargs)
|
super(DocumentVersionSignature, self).save(*args, **kwargs)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ def document_signature_download(request, document_pk):
|
|||||||
try:
|
try:
|
||||||
Permission.objects.check_permissions(request.user, [PERMISSION_SIGNATURE_DOWNLOAD])
|
Permission.objects.check_permissions(request.user, [PERMISSION_SIGNATURE_DOWNLOAD])
|
||||||
except PermissionDenied:
|
except PermissionDenied:
|
||||||
AccessEntry.objects.check_access(PERMISSION_SIGNATURE_DOWNLOAD, request.user, document)
|
AccessEntry.objects.check_access(PERMISSION_SIGNATURE_DOWNLOAD, request.user, document)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if DocumentVersionSignature.objects.has_detached_signature(document):
|
if DocumentVersionSignature.objects.has_detached_signature(document):
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ class Folder(models.Model):
|
|||||||
@models.permalink
|
@models.permalink
|
||||||
def get_absolute_url(self):
|
def get_absolute_url(self):
|
||||||
return ('folder_view', [self.pk])
|
return ('folder_view', [self.pk])
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def documents(self):
|
def documents(self):
|
||||||
return [folder_document.document for folder_document in self.folderdocument_set.all()]
|
return [folder_document.document for folder_document in self.folderdocument_set.all()]
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ from django.http import HttpResponseRedirect
|
|||||||
from django.shortcuts import render_to_response, get_object_or_404
|
from django.shortcuts import render_to_response, get_object_or_404
|
||||||
from django.template import RequestContext
|
from django.template import RequestContext
|
||||||
from django.contrib import messages
|
from django.contrib import messages
|
||||||
from django.views.generic.list_detail import object_list
|
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
from django.core.exceptions import PermissionDenied
|
from django.core.exceptions import PermissionDenied
|
||||||
|
|
||||||
@@ -19,7 +18,7 @@ from common.utils import encapsulate
|
|||||||
from acls.models import AccessEntry
|
from acls.models import AccessEntry
|
||||||
from acls.views import acl_list_for
|
from acls.views import acl_list_for
|
||||||
|
|
||||||
from .models import Folder, FolderDocument
|
from .models import Folder
|
||||||
from .forms import FolderForm, FolderListForm
|
from .forms import FolderForm, FolderListForm
|
||||||
from .permissions import (PERMISSION_FOLDER_CREATE,
|
from .permissions import (PERMISSION_FOLDER_CREATE,
|
||||||
PERMISSION_FOLDER_EDIT, PERMISSION_FOLDER_DELETE,
|
PERMISSION_FOLDER_EDIT, PERMISSION_FOLDER_DELETE,
|
||||||
|
|||||||
Reference in New Issue
Block a user