matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PEP8 Cleanups

Browse Source
This commit is contained in:
Roberto Rosario
2014-11-11 14:58:37 -04:00
parent 5fbfe99c2f
commit 84493b7a72
34 changed files with 30 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mayan/apps/common/settings.py
View File

@@ -65,4 +65,3 @@ register_setting(
default='storage.backends.filebasedstorage.FileBasedStorage',
description=_(u'A storage backend that all workers can use to share files.'),
)

1
mayan/apps/common/views.py
View File

@@ -454,7 +454,6 @@ class MultiFormView(FormView):
def post(self, request, *args, **kwargs):
form_classes = self.get_form_classes()
form_name = request.POST.get('action')
forms = self.get_forms(form_classes)
if all([form.is_valid() for form in forms.values()]):

1
mayan/apps/document_indexing/models.py
View File

@@ -9,7 +9,6 @@ from mptt.models import MPTTModel
from documents.models import Document, DocumentType
from .managers import IndexManager
from .settings import AVAILABLE_INDEXING_FUNCTIONS
class Index(models.Model):

3
mayan/apps/document_indexing/tasks.py
View File

@@ -1,8 +1,5 @@
import logging
from django.contrib.auth.models import User
from django.core.files import File
from mayan.celery import app
from documents.models import Document

1
mayan/apps/document_indexing/views.py
View File

@@ -1,6 +1,5 @@
from __future__ import absolute_import
from django.conf import settings
from django.contrib import messages
from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse

1
mayan/apps/documents/__init__.py
View File

@@ -3,7 +3,6 @@ from __future__ import absolute_import
import tempfile
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ugettext
from acls.api import class_permissions
from common.classes import ModelAttribute

4
mayan/apps/documents/managers.py
View File

@@ -62,7 +62,6 @@ class DocumentManager(models.Manager):
@transaction.atomic
def new_document(self, document_type, file_object, label, command_line=False, description=None, expand=False, language=None, user=None):
versions_created = []
is_compressed = None
if expand:
try:
@@ -76,13 +75,10 @@ class DocumentManager(models.Manager):
count += 1
except NotACompressedFile:
is_compressed = False
logging.debug('Exception: NotACompressedFile')
if command_line:
raise
versions_created.append(self.upload_single_document(document_type=document_type, file_object=file_object, description=description, label=label, language=language or LANGUAGE, user=user))
else:
is_compressed = True
else:
versions_created.append(self.upload_single_document(document_type=document_type, file_object=file_object, description=description, label=label, language=language or LANGUAGE, user=user))

1
mayan/apps/documents/serializers.py
View File

@@ -45,7 +45,6 @@ class DocumentTypeSerializer(serializers.ModelSerializer):
class NewDocumentSerializer(serializers.Serializer):
description = serializers.CharField(required=False)
document_type = DocumentTypeSerializer()
document_type = serializers.ChoiceField(choices=[(document_type.pk, document_type) for document_type in DocumentType.objects.all()])
expand = serializers.BooleanField(default=False)
file = serializers.FileField()

3
mayan/apps/documents/south_migrations/0021_auto__del_field_documentversion_serial__del_field_documentversion_rele.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
@@ -20,7 +19,6 @@ class Migration(SchemaMigration):
# Adding unique constraint on 'DocumentVersion', fields ['document', 'major', 'minor', 'micro']
db.create_unique(u'documents_documentversion', ['document_id', 'major', 'minor', 'micro'])
def backwards(self, orm):
# Removing unique constraint on 'DocumentVersion', fields ['document', 'major', 'minor', 'micro']
db.delete_unique(u'documents_documentversion', ['document_id', 'major', 'minor', 'micro'])
@@ -38,7 +36,6 @@ class Migration(SchemaMigration):
# Adding unique constraint on 'DocumentVersion', fields ['document', 'major', 'minor', 'micro', 'release_level', 'serial']
db.create_unique(u'documents_documentversion', ['document_id', 'major', 'minor', 'micro', 'release_level', 'serial'])
models = {
u'auth.group': {
'Meta': {'object_name': 'Group'},

3
mayan/apps/documents/south_migrations/0024_auto__add_field_documenttype_ocr.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
@@ -13,12 +12,10 @@ class Migration(SchemaMigration):
self.gf('django.db.models.fields.BooleanField')(default=True),
keep_default=False)
def backwards(self, orm):
# Deleting field 'DocumentType.ocr'
db.delete_column(u'documents_documenttype', 'ocr')
models = {
u'auth.group': {
'Meta': {'object_name': 'Group'},

3
mayan/apps/documents/south_migrations/0025_auto__add_field_document_language.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
@@ -13,12 +12,10 @@ class Migration(SchemaMigration):
self.gf('django.db.models.fields.CharField')(default=u'eng', max_length=8),
keep_default=False)
def backwards(self, orm):
# Deleting field 'Document.language'
db.delete_column(u'documents_document', 'language')
models = {
u'auth.group': {
'Meta': {'object_name': 'Group'},

3
mayan/apps/documents/south_migrations/0028_auto__del_field_documentversion_filename.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
@@ -11,14 +10,12 @@ class Migration(SchemaMigration):
# Deleting field 'DocumentVersion.filename'
db.delete_column(u'documents_documentversion', 'filename')
def backwards(self, orm):
# Adding field 'DocumentVersion.filename'
db.add_column(u'documents_documentversion', 'filename',
self.gf('django.db.models.fields.CharField')(default=u'', max_length=255, db_index=True),
keep_default=False)
models = {
u'auth.group': {
'Meta': {'object_name': 'Group'},

10
mayan/apps/documents/tests.py
View File

@@ -55,7 +55,7 @@ class DocumentTestCase(TestCase):
'version_update': VERSION_UPDATE_MAJOR,
}
new_version = self.document.new_version(file_object=File(file_object), **new_version_data)
self.document.new_version(file_object=File(file_object), **new_version_data)
self.failUnlessEqual(self.document.latest_version.get_formated_version(), '2.0.0')
@@ -87,7 +87,7 @@ class DocumentSearchTestCase(TestCase):
self.document.save()
with open(TEST_DOCUMENT_PATH) as file_object:
new_version = self.document.new_version(file_object=File(file_object, name='mayan_11_1.pdf'))
self.document.new_version(file_object=File(file_object, name='mayan_11_1.pdf'))
# Text extraction on the first page only
parse_document_page(self.document.latest_version.pages.all()[0])
@@ -148,7 +148,7 @@ class DocumentUploadFunctionalTestCase(TestCase):
self.assertTrue(self.admin_user.is_authenticated())
# Create new webform source
response = self.client.post(reverse('sources:setup_source_create', args=[SOURCE_CHOICE_WEB_FORM]), {'title': 'test', 'uncompress': 'n', 'enabled': True})
self.client.post(reverse('sources:setup_source_create', args=[SOURCE_CHOICE_WEB_FORM]), {'title': 'test', 'uncompress': 'n', 'enabled': True})
self.assertEqual(WebFormSource.objects.count(), 1)
# Upload the test document
@@ -180,7 +180,7 @@ class DocumentUploadFunctionalTestCase(TestCase):
self.assertTrue(self.admin_user.is_authenticated())
# Create new webform source
response = self.client.post(reverse('sources:setup_source_create', args=[SOURCE_CHOICE_WEB_FORM]), {'title': 'test', 'uncompress': 'n', 'enabled': True})
self.client.post(reverse('sources:setup_source_create', args=[SOURCE_CHOICE_WEB_FORM]), {'title': 'test', 'uncompress': 'n', 'enabled': True})
self.assertEqual(WebFormSource.objects.count(), 1)
# Upload the test document
@@ -295,7 +295,7 @@ class DocumentsViewsFunctionalTestCase(TestCase):
self.assertTrue(logged_in)
self.assertTrue(self.admin_user.is_authenticated())
# Create new webform source
response = self.client.post(reverse('sources:setup_source_create', args=[SOURCE_CHOICE_WEB_FORM]), {'title': 'test', 'uncompress': 'n', 'enabled': True})
self.client.post(reverse('sources:setup_source_create', args=[SOURCE_CHOICE_WEB_FORM]), {'title': 'test', 'uncompress': 'n', 'enabled': True})
self.assertEqual(WebFormSource.objects.count(), 1)
# Upload the test document

5
mayan/apps/documents/views.py
View File

@@ -290,6 +290,8 @@ def document_document_type_edit(request, document_id=None, document_id_list=None
context = {
'form': form,
'submit_label': _('Submit'),
'previous': previous,
'next': next,
}
if len(documents) == 1:
@@ -463,7 +465,8 @@ def document_update_page_count(request, document_id=None, document_id_list=None)
for document in documents:
task_update_page_count.apply_async(kwargs={'version_id': document.latest_version.pk}, queue='tools')
messages.success(request,
messages.success(
request,
ungettext(
_(u'Document queued for page count reset.'),
_(u'Documents queued for page count reset.'),

1
mayan/apps/folders/api_views.py
View File

@@ -40,7 +40,6 @@ class APIFolderListView(generics.ListCreateAPIView):
return super(APIFolderListView, self).post(*args, **kwargs)
def create(self, request, *args, **kwargs):
data = request.DATA
serializer = self.get_serializer(data=request.DATA, files=request.FILES)
if serializer.is_valid():

3
mayan/apps/folders/south_migrations/0003_auto.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
@@ -17,12 +16,10 @@ class Migration(SchemaMigration):
))
db.create_unique(m2m_table_name, ['folder_id', 'document_id'])
def backwards(self, orm):
# Removing M2M table for field documents on 'Folder'
db.delete_table(db.shorten_name(u'folders_folder_documents'))
models = {
u'auth.group': {
'Meta': {'object_name': 'Group'},

3
mayan/apps/folders/south_migrations/0005_auto__del_folderdocument.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
@@ -11,7 +10,6 @@ class Migration(SchemaMigration):
# Deleting model 'FolderDocument'
db.delete_table(u'folders_folderdocument')
def backwards(self, orm):
# Adding model 'FolderDocument'
db.create_table(u'folders_folderdocument', (
@@ -21,7 +19,6 @@ class Migration(SchemaMigration):
))
db.send_create_signal(u'folders', ['FolderDocument'])
models = {
u'auth.group': {
'Meta': {'object_name': 'Group'},

5
mayan/apps/linking/managers.py
View File

@@ -12,14 +12,11 @@ class SmartLinkManager(models.Manager):
def get_for(self, document, smart_link_obj=None):
errors = []
result = {}
metadata_dict = {}
for document_metadata in document.document_metadata.all():
metadata_dict[document_metadata.metadata_type.name] = document_metadata.value
smart_link_qs = self.model.objects.filter(enabled=True)
if smart_link_obj:
smart_link_qs= smart_link_qs.filter(pk=smart_link_obj.pk)
smart_link_qs = smart_link_qs.filter(pk=smart_link_obj.pk)
smart_link_qs = smart_link_qs.filter(document_types=document.document_type)

2
mayan/apps/linking/south_migrations/0001_initial.py
View File

@@ -30,7 +30,6 @@ class Migration(SchemaMigration):
))
db.send_create_signal(u'linking', ['SmartLinkCondition'])
def backwards(self, orm):
# Deleting model 'SmartLink'
db.delete_table(u'linking_smartlink')
@@ -38,7 +37,6 @@ class Migration(SchemaMigration):
# Deleting model 'SmartLinkCondition'
db.delete_table(u'linking_smartlinkcondition')
models = {
u'linking.smartlink': {
'Meta': {'object_name': 'SmartLink'},

2
mayan/apps/linking/south_migrations/0002_auto.py
View File

@@ -17,12 +17,10 @@ class Migration(SchemaMigration):
))
db.create_unique(m2m_table_name, ['smartlink_id', 'documenttype_id'])
def backwards(self, orm):
# Removing M2M table for field document_types on 'SmartLink'
db.delete_table(db.shorten_name(u'linking_smartlink_document_types'))
models = {
u'documents.documenttype': {
'Meta': {'ordering': "['name']", 'object_name': 'DocumentType'},

8
mayan/apps/linking/views.py
View File

@@ -269,7 +269,7 @@ def smart_link_condition_create(request, smart_link_pk):
AccessEntry.objects.check_accesses([PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT], request.user, smart_link)
if request.method == 'POST':
form = SmartLinkConditionForm(data=request.POST, smart_link=smart_link)
form = SmartLinkConditionForm(data=request.POST)
if form.is_valid():
new_smart_link_condition = form.save(commit=False)
new_smart_link_condition.smart_link = smart_link
@@ -277,7 +277,7 @@ def smart_link_condition_create(request, smart_link_pk):
messages.success(request, _(u'Smart link condition: "%s" created successfully.') % new_smart_link_condition)
return HttpResponseRedirect(reverse('linking:smart_link_condition_list', args=[smart_link.pk]))
else:
form = SmartLinkConditionForm(smart_link=smart_link)
form = SmartLinkConditionForm()
return render_to_response('main/generic_form.html', {
'form': form,
@@ -298,13 +298,13 @@ def smart_link_condition_edit(request, smart_link_condition_pk):
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse('main:home'))))
if request.method == 'POST':
form = SmartLinkConditionForm(request.POST, smart_link=smart_link_condition.smart_link, instance=smart_link_condition)
form = SmartLinkConditionForm(request.POST, instance=smart_link_condition)
if form.is_valid():
smart_link_condition = form.save()
messages.success(request, _(u'Smart link condition: "%s" edited successfully.') % smart_link_condition)
return HttpResponseRedirect(next)
else:
form = SmartLinkConditionForm(smart_link=smart_link_condition.smart_link, instance=smart_link_condition)
form = SmartLinkConditionForm(instance=smart_link_condition)
return render_to_response('main/generic_form.html', {
'form': form,

2
mayan/apps/lock_manager/south_migrations/0001_initial.py
View File

@@ -17,12 +17,10 @@ class Migration(SchemaMigration):
))
db.send_create_signal(u'lock_manager', ['Lock'])
def backwards(self, orm):
# Deleting model 'Lock'
db.delete_table(u'lock_manager_lock')
models = {
u'lock_manager.lock': {
'Meta': {'object_name': 'Lock'},

2
mayan/apps/lock_manager/tests.py
View File

@@ -30,7 +30,7 @@ class LockTestCase(TestCase):
lock_2.release()
def test_timeout_expired(self):
lock_1 = Lock.objects.acquire_lock(name='test_lock_1', timeout=1)
Lock.objects.acquire_lock(name='test_lock_1', timeout=1)
# lock_1 not release and not expired, should raise LockError
with self.assertRaises(LockError):

4
mayan/apps/metadata/classes.py
View File

@@ -1,8 +1,6 @@
from django.utils.translation import ugettext_lazy as _
from acls.classes import EncapsulatedObject
from .models import DocumentMetadata, DocumentTypeMetadataType, MetadataType
from .models import DocumentTypeMetadataType, MetadataType
class DocumentTypeMetadataTypeHelper(object):

1
mayan/apps/ocr/api_views.py
View File

@@ -10,7 +10,6 @@ from rest_framework.settings import api_settings
from acls.models import AccessEntry
from documents.models import Document
from permissions.models import Permission
from rest_api.filters import MayanObjectPermissionsFilter
from rest_api.permissions import MayanPermission
from .permissions import PERMISSION_OCR_DOCUMENT

2
mayan/apps/ocr/serializers.py
View File

@@ -2,8 +2,6 @@ from __future__ import absolute_import
from rest_framework import serializers
from .models import Document
class DocumentOCRSerializer(serializers.Serializer):
document_id = serializers.IntegerField()

2
mayan/apps/sources/south_migrations/0006_auto__del_field_source_whitelist__del_field_source_blacklist.py
View File

@@ -14,7 +14,6 @@ class Migration(SchemaMigration):
# Deleting field 'Source.blacklist'
db.delete_column(u'sources_source', 'blacklist')
def backwards(self, orm):
# Adding field 'Source.whitelist'
db.add_column(u'sources_source', 'whitelist',
@@ -26,7 +25,6 @@ class Migration(SchemaMigration):
self.gf('django.db.models.fields.TextField')(default='', blank=True),
keep_default=False)
models = {
u'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},

2
mayan/apps/sources/south_migrations/0007_set_doc_type.py
View File

@@ -1,6 +1,4 @@
# -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import DataMigration
from django.db import models

2
mayan/apps/sources/south_migrations/0009_auto__del_watchfoldersource__chg_field_intervalbasemodel_document_type.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
@@ -37,7 +36,6 @@ class Migration(SchemaMigration):
))
db.send_create_signal(u'sources', ['WatchFolderSource'])
# Changing field 'IntervalBaseModel.document_type'
db.alter_column(u'sources_intervalbasemodel', 'document_type_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['documents.DocumentType'], null=True))

3
mayan/apps/sources/south_migrations/0010_auto__add_watchfoldersource.py
View File

@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
@@ -16,12 +15,10 @@ class Migration(SchemaMigration):
))
db.send_create_signal(u'sources', ['WatchFolderSource'])
def backwards(self, orm):
# Deleting model 'WatchFolderSource'
db.delete_table(u'sources_watchfoldersource')
models = {
u'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},

2
mayan/apps/sources/south_migrations/0011_auto__del_field_intervalbasemodel_document_type.py
View File

@@ -11,7 +11,6 @@ class Migration(SchemaMigration):
# Deleting field 'IntervalBaseModel.document_type'
db.delete_column(u'sources_intervalbasemodel', 'document_type_id')
def backwards(self, orm):
# User chose to not deal with backwards NULL issues for 'IntervalBaseModel.document_type'
@@ -22,7 +21,6 @@ class Migration(SchemaMigration):
self.gf('django.db.models.fields.related.ForeignKey')(to=orm['documents.DocumentType']),
keep_default=False)
models = {
u'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},

2
mayan/apps/sources/south_migrations/0012_auto__add_field_intervalbasemodel_document_type.py
View File

@@ -13,12 +13,10 @@ class Migration(SchemaMigration):
self.gf('django.db.models.fields.related.ForeignKey')(to=orm['documents.DocumentType'], null=True),
keep_default=False)
def backwards(self, orm):
# Deleting field 'IntervalBaseModel.document_type'
db.delete_column(u'sources_intervalbasemodel', 'document_type_id')
models = {
u'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},

1
mayan/apps/sources/wizards.py
View File

@@ -60,7 +60,6 @@ class DocumentCreateWizard(MayanPermissionCheckMixin, SessionWizardView):
'metadata_type': metadata_type,
})
return initial
return self.initial_dict.get(step, {})