From f4d3767b152316fb90fbe49545505b3398187bd5 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 26 Jan 2015 19:17:35 -0400 Subject: [PATCH] PEP8 cleanup, remove unused imports, fix permission check when removing metadata from a document --- mayan/apps/common/mixins.py | 4 +--- .../0006_auto__add_shareduploadedfile.py | 5 +---- ...uto__add_field_shareduploadedfile_filename.py | 5 +---- ...uto__add_field_shareduploadedfile_datatime.py | 4 +--- .../0009_auto__add_userlocaleprofile.py | 5 +---- .../0010_create_locale_profiles.py | 1 - mayan/apps/common/views.py | 5 ----- mayan/apps/converter/backends/python.py | 1 - mayan/apps/django_gpg/api.py | 1 - mayan/apps/document_indexing/api.py | 1 - .../0007_auto__del_documentrenamecount.py | 5 +---- mayan/apps/document_states/links.py | 3 --- .../south_migrations/0001_initial.py | 5 +---- ...uto__add_field_workflowtransition_workflow.py | 5 +---- ...nsition_workflow_origin_state_destination_.py | 5 +---- ...ancelogentry_document__del_field_workflowi.py | 9 +++------ ...te_label__add_unique_workflowstate_workflo.py | 5 +---- ...nsition_label__del_unique_workflowtransiti.py | 5 +---- ...ow__del_unique_documenttypeworkflow_docume.py | 5 +---- ...ancelogentry_user__add_field_workflowinsta.py | 5 +---- ...dd_index_workflowinstancelogentry_datetime.py | 5 +---- mayan/apps/document_states/views.py | 13 +++++-------- mayan/apps/documents/models.py | 5 ----- ...18_auto__chg_field_documentpage_page_label.py | 1 - ...nt_datetime_accessed__chg_field_documentve.py | 1 - .../south_migrations/0022_set_doc_type.py | 1 - ...023_auto__chg_field_document_document_type.py | 1 - .../0026_auto__add_field_document_label.py | 3 +-- .../0027_move_filename_to_label.py | 1 - ...ion_major__del_field_documentversion_micro.py | 5 +---- ...ocumenttypefilename_document_type_filename.py | 5 +---- .../0031_remove_orphan_documents.py | 1 - mayan/apps/documents/views.py | 1 - mayan/apps/documents/widgets.py | 1 - mayan/apps/dynamic_search/tests.py | 12 +++++------- .../apps/events/south_migrations/0001_initial.py | 5 +---- .../0002_migrate_history_data.py | 1 - .../folders/south_migrations/0004_m2m_fields.py | 1 - ...06_auto__chg_field_folder_datetime_created.py | 3 +-- mayan/apps/history/__init__.py | 1 - .../history/south_migrations/0001_initial.py | 5 +---- .../0002_auto__chg_field_history_datetime.py | 3 +-- ...rytype__del_unique_historytype_namespace_n.py | 7 +------ mayan/apps/linking/views.py | 3 ++- .../south_migrations/0001_initial.py | 1 - ...002_auto__chg_field_lock_creation_datetime.py | 3 +-- mayan/apps/main/views.py | 2 -- mayan/apps/metadata/api_views.py | 8 ++------ ...etadatasetitem__chg_field_documentmetadata.py | 5 +---- ...005_auto__chg_field_documentmetadata_value.py | 3 +-- ..._auto__add_documenttypemetadatatypeoptions.py | 5 +---- ...ts__del_documenttypemetadatatypeoptions__a.py | 5 +---- ...pemetadatatype_document_type_metadata_type.py | 5 +---- .../0009_auto__chg_field_metadatatype_title.py | 3 +-- ...ue_documentmetadata_document_metadata_type.py | 5 +---- ...11_auto__add_field_metadatatype_validation.py | 5 +---- mayan/apps/metadata/tasks.py | 1 - mayan/apps/metadata/views.py | 16 ++++++++-------- ...t_node_name__chg_field_queuedocument_datet.py | 3 +-- ..._queuedocument__add_documentversionocrerro.py | 5 +---- mayan/apps/permissions/api_views.py | 8 +++++--- mayan/apps/permissions/views.py | 8 +++----- mayan/apps/project_setup/views.py | 2 +- mayan/apps/project_tools/views.py | 2 +- mayan/apps/smart_settings/views.py | 2 +- mayan/apps/sources/forms.py | 2 -- ...ervalbasemodel__add_pop3email__add_emailba.py | 5 +---- ...urce_whitelist__del_field_source_blacklist.py | 1 - ..._chg_field_intervalbasemodel_document_type.py | 1 - ..._del_field_intervalbasemodel_document_type.py | 1 - ..._add_field_intervalbasemodel_document_type.py | 1 - ...ield_watchfoldersource_delete_after_upload.py | 1 - mayan/apps/sources/tests.py | 15 ++++++--------- mayan/apps/sources/widgets.py | 1 - mayan/apps/tags/views.py | 1 - mayan/apps/user_management/__init__.py | 4 ---- 76 files changed, 76 insertions(+), 223 deletions(-) diff --git a/mayan/apps/common/mixins.py b/mayan/apps/common/mixins.py index 009895a4ed..c3a8a06b3a 100644 --- a/mayan/apps/common/mixins.py +++ b/mayan/apps/common/mixins.py @@ -19,7 +19,6 @@ class ExtraContextMixin(object): return context - class ObjectListPermissionFilterMixin(object): object_permission = None @@ -54,7 +53,6 @@ class ObjectPermissionCheckMixin(object): return super(ObjectPermissionCheckMixin, self).dispatch(request, *args, **kwargs) - class RedirectionMixin(object): post_action_redirect = None @@ -75,6 +73,7 @@ class RedirectionMixin(object): return context + class ViewPermissionCheckMixin(object): view_permission = None @@ -83,4 +82,3 @@ class ViewPermissionCheckMixin(object): Permission.objects.check_permissions(self.request.user, [self.view_permission]) return super(ViewPermissionCheckMixin, self).dispatch(request, *args, **kwargs) - diff --git a/mayan/apps/common/south_migrations/0006_auto__add_shareduploadedfile.py b/mayan/apps/common/south_migrations/0006_auto__add_shareduploadedfile.py index 96acafbb7a..c0d64bcf26 100644 --- a/mayan/apps/common/south_migrations/0006_auto__add_shareduploadedfile.py +++ b/mayan/apps/common/south_migrations/0006_auto__add_shareduploadedfile.py @@ -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 @@ -15,12 +14,10 @@ class Migration(SchemaMigration): )) db.send_create_signal(u'common', ['SharedUploadedFile']) - def backwards(self, orm): # Deleting model 'SharedUploadedFile' db.delete_table(u'common_shareduploadedfile') - models = { u'auth.group': { 'Meta': {'object_name': 'Group'}, @@ -76,4 +73,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['common'] \ No newline at end of file + complete_apps = ['common'] diff --git a/mayan/apps/common/south_migrations/0007_auto__add_field_shareduploadedfile_filename.py b/mayan/apps/common/south_migrations/0007_auto__add_field_shareduploadedfile_filename.py index 57afe95673..a835618ad5 100644 --- a/mayan/apps/common/south_migrations/0007_auto__add_field_shareduploadedfile_filename.py +++ b/mayan/apps/common/south_migrations/0007_auto__add_field_shareduploadedfile_filename.py @@ -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='', max_length=255), keep_default=False) - def backwards(self, orm): # Deleting field 'SharedUploadedFile.filename' db.delete_column(u'common_shareduploadedfile', 'filename') - models = { u'auth.group': { 'Meta': {'object_name': 'Group'}, @@ -75,4 +72,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['common'] \ No newline at end of file + complete_apps = ['common'] diff --git a/mayan/apps/common/south_migrations/0008_auto__add_field_shareduploadedfile_datatime.py b/mayan/apps/common/south_migrations/0008_auto__add_field_shareduploadedfile_datatime.py index eca4a154a9..8548c50407 100644 --- a/mayan/apps/common/south_migrations/0008_auto__add_field_shareduploadedfile_datatime.py +++ b/mayan/apps/common/south_migrations/0008_auto__add_field_shareduploadedfile_datatime.py @@ -13,12 +13,10 @@ class Migration(SchemaMigration): self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, default=datetime.datetime(2014, 10, 29, 0, 0), blank=True), keep_default=False) - def backwards(self, orm): # Deleting field 'SharedUploadedFile.datatime' db.delete_column(u'common_shareduploadedfile', 'datatime') - models = { u'auth.group': { 'Meta': {'object_name': 'Group'}, @@ -76,4 +74,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['common'] \ No newline at end of file + complete_apps = ['common'] diff --git a/mayan/apps/common/south_migrations/0009_auto__add_userlocaleprofile.py b/mayan/apps/common/south_migrations/0009_auto__add_userlocaleprofile.py index 57d95f38f8..030b9e3395 100644 --- a/mayan/apps/common/south_migrations/0009_auto__add_userlocaleprofile.py +++ b/mayan/apps/common/south_migrations/0009_auto__add_userlocaleprofile.py @@ -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.send_create_signal(u'common', ['UserLocaleProfile']) - def backwards(self, orm): # Deleting model 'UserLocaleProfile' db.delete_table(u'common_userlocaleprofile') - models = { u'auth.group': { 'Meta': {'object_name': 'Group'}, @@ -87,4 +84,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['common'] \ No newline at end of file + complete_apps = ['common'] diff --git a/mayan/apps/common/south_migrations/0010_create_locale_profiles.py b/mayan/apps/common/south_migrations/0010_create_locale_profiles.py index 70c80cd5f3..2c8099d470 100644 --- a/mayan/apps/common/south_migrations/0010_create_locale_profiles.py +++ b/mayan/apps/common/south_migrations/0010_create_locale_profiles.py @@ -1,5 +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 diff --git a/mayan/apps/common/views.py b/mayan/apps/common/views.py index de8274be23..9c16ed543a 100644 --- a/mayan/apps/common/views.py +++ b/mayan/apps/common/views.py @@ -7,7 +7,6 @@ from django.contrib.auth.models import User from django.contrib.auth.views import login, password_change from django.contrib.contenttypes.models import ContentType from django.conf import settings -from django.core.exceptions import PermissionDenied from django.core.urlresolvers import reverse from django.http import HttpResponseRedirect from django.shortcuts import redirect, render_to_response @@ -18,9 +17,6 @@ from django.views.generic import FormView from django.views.generic.edit import CreateView, DeleteView, UpdateView from django.views.generic.list import ListView -from acls.models import AccessEntry -from permissions.models import Permission - from .forms import ( ChoiceForm, EmailAuthenticationForm, LicenseForm, LocaleProfileForm, LocaleProfileForm_view, UserForm, UserForm_view @@ -308,7 +304,6 @@ def password_change_done(request): return redirect('common:current_user_details') - class SingleObjectEditView(ViewPermissionCheckMixin, ObjectPermissionCheckMixin, ExtraContextMixin, RedirectionMixin, UpdateView): template_name = 'main/generic_form.html' diff --git a/mayan/apps/converter/backends/python.py b/mayan/apps/converter/backends/python.py index a3ad0a83ca..5ec40c5355 100644 --- a/mayan/apps/converter/backends/python.py +++ b/mayan/apps/converter/backends/python.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals import io import logging -import tempfile import slate from PIL import Image diff --git a/mayan/apps/django_gpg/api.py b/mayan/apps/django_gpg/api.py index a506daec56..a577c455ab 100644 --- a/mayan/apps/django_gpg/api.py +++ b/mayan/apps/django_gpg/api.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals import logging import os -import sys import tempfile try: diff --git a/mayan/apps/document_indexing/api.py b/mayan/apps/document_indexing/api.py index dc8cf12b75..151e024cda 100644 --- a/mayan/apps/document_indexing/api.py +++ b/mayan/apps/document_indexing/api.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals import logging -from django.db.models import Q from django.utils.translation import ugettext_lazy as _ from .models import Index, IndexInstanceNode diff --git a/mayan/apps/document_indexing/south_migrations/0007_auto__del_documentrenamecount.py b/mayan/apps/document_indexing/south_migrations/0007_auto__del_documentrenamecount.py index ec015b7182..857060e9c4 100644 --- a/mayan/apps/document_indexing/south_migrations/0007_auto__del_documentrenamecount.py +++ b/mayan/apps/document_indexing/south_migrations/0007_auto__del_documentrenamecount.py @@ -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 'DocumentRenameCount' db.delete_table(u'document_indexing_documentrenamecount') - def backwards(self, orm): # Adding model 'DocumentRenameCount' db.create_table(u'document_indexing_documentrenamecount', ( @@ -22,7 +20,6 @@ class Migration(SchemaMigration): )) db.send_create_signal('document_indexing', ['DocumentRenameCount']) - models = { u'document_indexing.index': { 'Meta': {'object_name': 'Index'}, @@ -75,4 +72,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['document_indexing'] \ No newline at end of file + complete_apps = ['document_indexing'] diff --git a/mayan/apps/document_states/links.py b/mayan/apps/document_states/links.py index 864138de69..97d9758c88 100644 --- a/mayan/apps/document_states/links.py +++ b/mayan/apps/document_states/links.py @@ -22,6 +22,3 @@ link_setup_workflow_document_types = {'text': _('Document types'), 'view': 'docu link_document_workflow_instance_list = {'text': _('Workflows'), 'view': 'document_states:document_workflow_instance_list', 'args': 'object.pk', 'famfam': 'table'} link_workflow_instance_detail = {'text': _('Detail'), 'view': 'document_states:workflow_instance_detail', 'args': 'workflow_instance.pk', 'famfam': 'table'} link_workflow_instance_transition = {'text': _('Transition'), 'view': 'document_states:workflow_instance_transition', 'args': 'workflow_instance.pk', 'famfam': 'table_lightning'} - - - diff --git a/mayan/apps/document_states/south_migrations/0001_initial.py b/mayan/apps/document_states/south_migrations/0001_initial.py index 60d8ef7b31..c766932295 100644 --- a/mayan/apps/document_states/south_migrations/0001_initial.py +++ b/mayan/apps/document_states/south_migrations/0001_initial.py @@ -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 @@ -64,7 +63,6 @@ class Migration(SchemaMigration): )) db.send_create_signal(u'document_states', ['WorkflowInstanceLogEntry']) - def backwards(self, orm): # Removing unique constraint on 'WorkflowInstance', fields ['document', 'workflow'] db.delete_unique(u'document_states_workflowinstance', ['document_id', 'workflow_id']) @@ -90,7 +88,6 @@ class Migration(SchemaMigration): # Deleting model 'WorkflowInstanceLogEntry' db.delete_table(u'document_states_workflowinstancelogentry') - models = { u'document_states.documenttypeworkflow': { 'Meta': {'unique_together': "((u'document_type', u'workflow'),)", 'object_name': 'DocumentTypeWorkflow'}, @@ -148,4 +145,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['document_states'] \ No newline at end of file + complete_apps = ['document_states'] diff --git a/mayan/apps/document_states/south_migrations/0002_auto__add_field_workflowtransition_workflow.py b/mayan/apps/document_states/south_migrations/0002_auto__add_field_workflowtransition_workflow.py index 2cfc126a0f..3a7faaad6b 100644 --- a/mayan/apps/document_states/south_migrations/0002_auto__add_field_workflowtransition_workflow.py +++ b/mayan/apps/document_states/south_migrations/0002_auto__add_field_workflowtransition_workflow.py @@ -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.related.ForeignKey')(default=1, to=orm['document_states.Workflow']), keep_default=False) - def backwards(self, orm): # Deleting field 'WorkflowTransition.workflow' db.delete_column(u'document_states_workflowtransition', 'workflow_id') - models = { u'document_states.documenttypeworkflow': { 'Meta': {'unique_together': "((u'document_type', u'workflow'),)", 'object_name': 'DocumentTypeWorkflow'}, @@ -77,4 +74,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['document_states'] \ No newline at end of file + complete_apps = ['document_states'] diff --git a/mayan/apps/document_states/south_migrations/0003_auto__add_unique_workflowtransition_workflow_origin_state_destination_.py b/mayan/apps/document_states/south_migrations/0003_auto__add_unique_workflowtransition_workflow_origin_state_destination_.py index 1feea7fe2b..d7b9a2cbf2 100644 --- a/mayan/apps/document_states/south_migrations/0003_auto__add_unique_workflowtransition_workflow_origin_state_destination_.py +++ b/mayan/apps/document_states/south_migrations/0003_auto__add_unique_workflowtransition_workflow_origin_state_destination_.py @@ -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,12 +10,10 @@ class Migration(SchemaMigration): # Adding unique constraint on 'WorkflowTransition', fields ['workflow', 'origin_state', 'destination_state'] db.create_unique(u'document_states_workflowtransition', ['workflow_id', 'origin_state_id', 'destination_state_id']) - def backwards(self, orm): # Removing unique constraint on 'WorkflowTransition', fields ['workflow', 'origin_state', 'destination_state'] db.delete_unique(u'document_states_workflowtransition', ['workflow_id', 'origin_state_id', 'destination_state_id']) - models = { u'document_states.documenttypeworkflow': { 'Meta': {'unique_together': "((u'document_type', u'workflow'),)", 'object_name': 'DocumentTypeWorkflow'}, @@ -75,4 +72,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['document_states'] \ No newline at end of file + complete_apps = ['document_states'] diff --git a/mayan/apps/document_states/south_migrations/0004_auto__del_field_workflowinstancelogentry_document__del_field_workflowi.py b/mayan/apps/document_states/south_migrations/0004_auto__del_field_workflowinstancelogentry_document__del_field_workflowi.py index 320583de9e..cad6ec63a4 100644 --- a/mayan/apps/document_states/south_migrations/0004_auto__del_field_workflowinstancelogentry_document__del_field_workflowi.py +++ b/mayan/apps/document_states/south_migrations/0004_auto__del_field_workflowinstancelogentry_document__del_field_workflowi.py @@ -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 @@ -24,12 +23,11 @@ class Migration(SchemaMigration): self.gf('django.db.models.fields.related.ForeignKey')(default=1, to=orm['document_states.WorkflowTransition']), keep_default=False) - def backwards(self, orm): # User chose to not deal with backwards NULL issues for 'WorkflowInstanceLogEntry.document' raise RuntimeError("Cannot reverse this migration. 'WorkflowInstanceLogEntry.document' and its values cannot be restored.") - + # The following code is provided here to aid in writing a correct migration # Adding field 'WorkflowInstanceLogEntry.document' db.add_column(u'document_states_workflowinstancelogentry', 'document', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['documents.Document']), @@ -38,7 +36,7 @@ class Migration(SchemaMigration): # User chose to not deal with backwards NULL issues for 'WorkflowInstanceLogEntry.workflow_instace' raise RuntimeError("Cannot reverse this migration. 'WorkflowInstanceLogEntry.workflow_instace' and its values cannot be restored.") - + # The following code is provided here to aid in writing a correct migration # Adding field 'WorkflowInstanceLogEntry.workflow_instace' db.add_column(u'document_states_workflowinstancelogentry', 'workflow_instace', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['document_states.WorkflowInstance']), @@ -50,7 +48,6 @@ class Migration(SchemaMigration): # Deleting field 'WorkflowInstanceLogEntry.transition' db.delete_column(u'document_states_workflowinstancelogentry', 'transition_id') - models = { u'document_states.documenttypeworkflow': { 'Meta': {'unique_together': "((u'document_type', u'workflow'),)", 'object_name': 'DocumentTypeWorkflow'}, @@ -109,4 +106,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['document_states'] \ No newline at end of file + complete_apps = ['document_states'] diff --git a/mayan/apps/document_states/south_migrations/0005_auto__del_unique_workflowstate_label__add_unique_workflowstate_workflo.py b/mayan/apps/document_states/south_migrations/0005_auto__del_unique_workflowstate_label__add_unique_workflowstate_workflo.py index 81165d4a41..c47f132ba5 100644 --- a/mayan/apps/document_states/south_migrations/0005_auto__del_unique_workflowstate_label__add_unique_workflowstate_workflo.py +++ b/mayan/apps/document_states/south_migrations/0005_auto__del_unique_workflowstate_label__add_unique_workflowstate_workflo.py @@ -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 @@ -14,7 +13,6 @@ class Migration(SchemaMigration): # Adding unique constraint on 'WorkflowState', fields ['workflow', 'label'] db.create_unique(u'document_states_workflowstate', ['workflow_id', 'label']) - def backwards(self, orm): # Removing unique constraint on 'WorkflowState', fields ['workflow', 'label'] db.delete_unique(u'document_states_workflowstate', ['workflow_id', 'label']) @@ -22,7 +20,6 @@ class Migration(SchemaMigration): # Adding unique constraint on 'WorkflowState', fields ['label'] db.create_unique(u'document_states_workflowstate', ['label']) - models = { u'document_states.documenttypeworkflow': { 'Meta': {'unique_together': "((u'document_type', u'workflow'),)", 'object_name': 'DocumentTypeWorkflow'}, @@ -81,4 +78,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['document_states'] \ No newline at end of file + complete_apps = ['document_states'] diff --git a/mayan/apps/document_states/south_migrations/0006_auto__del_unique_workflowtransition_label__del_unique_workflowtransiti.py b/mayan/apps/document_states/south_migrations/0006_auto__del_unique_workflowtransition_label__del_unique_workflowtransiti.py index ec1f2dd7b1..035cf2aeed 100644 --- a/mayan/apps/document_states/south_migrations/0006_auto__del_unique_workflowtransition_label__del_unique_workflowtransiti.py +++ b/mayan/apps/document_states/south_migrations/0006_auto__del_unique_workflowtransition_label__del_unique_workflowtransiti.py @@ -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,7 +16,6 @@ class Migration(SchemaMigration): # Adding unique constraint on 'WorkflowTransition', fields ['workflow', 'label', 'origin_state', 'destination_state'] db.create_unique(u'document_states_workflowtransition', ['workflow_id', 'label', 'origin_state_id', 'destination_state_id']) - def backwards(self, orm): # Removing unique constraint on 'WorkflowTransition', fields ['workflow', 'label', 'origin_state', 'destination_state'] db.delete_unique(u'document_states_workflowtransition', ['workflow_id', 'label', 'origin_state_id', 'destination_state_id']) @@ -28,7 +26,6 @@ class Migration(SchemaMigration): # Adding unique constraint on 'WorkflowTransition', fields ['workflow', 'origin_state', 'destination_state'] db.create_unique(u'document_states_workflowtransition', ['workflow_id', 'origin_state_id', 'destination_state_id']) - models = { u'document_states.documenttypeworkflow': { 'Meta': {'unique_together': "((u'document_type', u'workflow'),)", 'object_name': 'DocumentTypeWorkflow'}, @@ -87,4 +84,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['document_states'] \ No newline at end of file + complete_apps = ['document_states'] diff --git a/mayan/apps/document_states/south_migrations/0007_auto__del_documenttypeworkflow__del_unique_documenttypeworkflow_docume.py b/mayan/apps/document_states/south_migrations/0007_auto__del_documenttypeworkflow__del_unique_documenttypeworkflow_docume.py index 9c16d0fe44..93a37322a8 100644 --- a/mayan/apps/document_states/south_migrations/0007_auto__del_documenttypeworkflow__del_unique_documenttypeworkflow_docume.py +++ b/mayan/apps/document_states/south_migrations/0007_auto__del_documenttypeworkflow__del_unique_documenttypeworkflow_docume.py @@ -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 @@ -23,7 +22,6 @@ class Migration(SchemaMigration): )) db.create_unique(m2m_table_name, ['workflow_id', 'documenttype_id']) - def backwards(self, orm): # Adding model 'DocumentTypeWorkflow' db.create_table(u'document_states_documenttypeworkflow', ( @@ -39,7 +37,6 @@ class Migration(SchemaMigration): # Removing M2M table for field document_types on 'Workflow' db.delete_table(db.shorten_name(u'document_states_workflow_document_types')) - models = { u'document_states.workflow': { 'Meta': {'object_name': 'Workflow'}, @@ -93,4 +90,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['document_states'] \ No newline at end of file + complete_apps = ['document_states'] diff --git a/mayan/apps/document_states/south_migrations/0008_auto__add_field_workflowinstancelogentry_user__add_field_workflowinsta.py b/mayan/apps/document_states/south_migrations/0008_auto__add_field_workflowinstancelogentry_user__add_field_workflowinsta.py index 3f998c5b02..69809d7fed 100644 --- a/mayan/apps/document_states/south_migrations/0008_auto__add_field_workflowinstancelogentry_user__add_field_workflowinsta.py +++ b/mayan/apps/document_states/south_migrations/0008_auto__add_field_workflowinstancelogentry_user__add_field_workflowinsta.py @@ -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 @@ -18,7 +17,6 @@ class Migration(SchemaMigration): self.gf('django.db.models.fields.TextField')(default='', blank=True), keep_default=False) - def backwards(self, orm): # Deleting field 'WorkflowInstanceLogEntry.user' db.delete_column(u'document_states_workflowinstancelogentry', 'user_id') @@ -26,7 +24,6 @@ class Migration(SchemaMigration): # Deleting field 'WorkflowInstanceLogEntry.comment' db.delete_column(u'document_states_workflowinstancelogentry', 'comment') - models = { u'auth.group': { 'Meta': {'object_name': 'Group'}, @@ -118,4 +115,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['document_states'] \ No newline at end of file + complete_apps = ['document_states'] diff --git a/mayan/apps/document_states/south_migrations/0009_auto__add_index_workflowinstancelogentry_datetime.py b/mayan/apps/document_states/south_migrations/0009_auto__add_index_workflowinstancelogentry_datetime.py index 3f884f2719..57772863c5 100644 --- a/mayan/apps/document_states/south_migrations/0009_auto__add_index_workflowinstancelogentry_datetime.py +++ b/mayan/apps/document_states/south_migrations/0009_auto__add_index_workflowinstancelogentry_datetime.py @@ -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,12 +10,10 @@ class Migration(SchemaMigration): # Adding index on 'WorkflowInstanceLogEntry', fields ['datetime'] db.create_index(u'document_states_workflowinstancelogentry', ['datetime']) - def backwards(self, orm): # Removing index on 'WorkflowInstanceLogEntry', fields ['datetime'] db.delete_index(u'document_states_workflowinstancelogentry', ['datetime']) - models = { u'auth.group': { 'Meta': {'object_name': 'Group'}, @@ -108,4 +105,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['document_states'] \ No newline at end of file + complete_apps = ['document_states'] diff --git a/mayan/apps/document_states/views.py b/mayan/apps/document_states/views.py index 33e2908fdd..2fbcac1b84 100644 --- a/mayan/apps/document_states/views.py +++ b/mayan/apps/document_states/views.py @@ -1,24 +1,20 @@ from __future__ import absolute_import, unicode_literals -from django.conf import settings from django.contrib import messages from django.core.exceptions import PermissionDenied from django.core.urlresolvers import reverse, reverse_lazy from django.db.utils import IntegrityError from django.http import HttpResponseRedirect -from django.shortcuts import render_to_response, get_object_or_404 -from django.template import RequestContext -from django.utils.http import urlencode -from django.utils.translation import ugettext_lazy as _, ungettext +from django.shortcuts import get_object_or_404 +from django.utils.translation import ugettext_lazy as _ from django.views.generic import FormView from acls.models import AccessEntry -from common.utils import encapsulate, generate_choices_w_labels +from common.utils import generate_choices_w_labels from common.views import ( SingleObjectCreateView, SingleObjectDeleteView, SingleObjectEditView, SingleObjectListView, assign_remove ) -from common.widgets import two_state_template from documents.models import Document from permissions.models import Permission @@ -82,7 +78,8 @@ class WorkflowInstanceDetailView(SingleObjectListView): return self.get_workflow_instance().log_entries.order_by('-datetime') def get_context_data(self, **kwargs): - form = WorkflowInstanceDetailForm(instance=self.get_workflow_instance(), extra_fields=[ + form = WorkflowInstanceDetailForm( + instance=self.get_workflow_instance(), extra_fields=[ {'label': _('Current state'), 'field': 'get_current_state'}, {'label': _('Last transition'), 'field': 'get_last_transition'}, ] diff --git a/mayan/apps/documents/models.py b/mayan/apps/documents/models.py index 1f9f956c21..fbb74a9008 100644 --- a/mayan/apps/documents/models.py +++ b/mayan/apps/documents/models.py @@ -8,11 +8,6 @@ import os import tempfile import uuid -try: - from cStringIO import StringIO -except ImportError: - from StringIO import StringIO - from django.db import models from django.contrib.auth.models import User from django.core.exceptions import ValidationError diff --git a/mayan/apps/documents/south_migrations/0018_auto__chg_field_documentpage_page_label.py b/mayan/apps/documents/south_migrations/0018_auto__chg_field_documentpage_page_label.py index 17a624061e..a8e54d8059 100644 --- a/mayan/apps/documents/south_migrations/0018_auto__chg_field_documentpage_page_label.py +++ b/mayan/apps/documents/south_migrations/0018_auto__chg_field_documentpage_page_label.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models diff --git a/mayan/apps/documents/south_migrations/0020_auto__chg_field_recentdocument_datetime_accessed__chg_field_documentve.py b/mayan/apps/documents/south_migrations/0020_auto__chg_field_recentdocument_datetime_accessed__chg_field_documentve.py index 0ad55d4d04..aef1915958 100644 --- a/mayan/apps/documents/south_migrations/0020_auto__chg_field_recentdocument_datetime_accessed__chg_field_documentve.py +++ b/mayan/apps/documents/south_migrations/0020_auto__chg_field_recentdocument_datetime_accessed__chg_field_documentve.py @@ -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 diff --git a/mayan/apps/documents/south_migrations/0022_set_doc_type.py b/mayan/apps/documents/south_migrations/0022_set_doc_type.py index b3a4f486be..303228e7ec 100644 --- a/mayan/apps/documents/south_migrations/0022_set_doc_type.py +++ b/mayan/apps/documents/south_migrations/0022_set_doc_type.py @@ -1,5 +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 diff --git a/mayan/apps/documents/south_migrations/0023_auto__chg_field_document_document_type.py b/mayan/apps/documents/south_migrations/0023_auto__chg_field_document_document_type.py index 2867a05414..c7b2c9f3ab 100644 --- a/mayan/apps/documents/south_migrations/0023_auto__chg_field_document_document_type.py +++ b/mayan/apps/documents/south_migrations/0023_auto__chg_field_document_document_type.py @@ -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 diff --git a/mayan/apps/documents/south_migrations/0026_auto__add_field_document_label.py b/mayan/apps/documents/south_migrations/0026_auto__add_field_document_label.py index e479bc3997..f1c91d4507 100644 --- a/mayan/apps/documents/south_migrations/0026_auto__add_field_document_label.py +++ b/mayan/apps/documents/south_migrations/0026_auto__add_field_document_label.py @@ -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 @@ -119,4 +118,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['documents'] \ No newline at end of file + complete_apps = ['documents'] diff --git a/mayan/apps/documents/south_migrations/0027_move_filename_to_label.py b/mayan/apps/documents/south_migrations/0027_move_filename_to_label.py index 42dbb758f1..5d42cb11b3 100644 --- a/mayan/apps/documents/south_migrations/0027_move_filename_to_label.py +++ b/mayan/apps/documents/south_migrations/0027_move_filename_to_label.py @@ -1,5 +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 diff --git a/mayan/apps/documents/south_migrations/0029_auto__del_field_documentversion_major__del_field_documentversion_micro.py b/mayan/apps/documents/south_migrations/0029_auto__del_field_documentversion_major__del_field_documentversion_micro.py index 86df6c8a09..61e204dc83 100644 --- a/mayan/apps/documents/south_migrations/0029_auto__del_field_documentversion_major__del_field_documentversion_micro.py +++ b/mayan/apps/documents/south_migrations/0029_auto__del_field_documentversion_major__del_field_documentversion_micro.py @@ -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): # Deleting field 'DocumentVersion.minor' db.delete_column(u'documents_documentversion', 'minor') - def backwards(self, orm): # Adding field 'DocumentVersion.major' db.add_column(u'documents_documentversion', 'major', @@ -40,7 +38,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']) - models = { u'auth.group': { 'Meta': {'object_name': 'Group'}, @@ -137,4 +134,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['documents'] \ No newline at end of file + complete_apps = ['documents'] diff --git a/mayan/apps/documents/south_migrations/0030_auto__add_unique_documenttypefilename_document_type_filename.py b/mayan/apps/documents/south_migrations/0030_auto__add_unique_documenttypefilename_document_type_filename.py index f3b8e60d75..fced48ac6b 100644 --- a/mayan/apps/documents/south_migrations/0030_auto__add_unique_documenttypefilename_document_type_filename.py +++ b/mayan/apps/documents/south_migrations/0030_auto__add_unique_documenttypefilename_document_type_filename.py @@ -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,12 +10,10 @@ class Migration(SchemaMigration): # Adding unique constraint on 'DocumentTypeFilename', fields ['document_type', 'filename'] db.create_unique(u'documents_documenttypefilename', ['document_type_id', 'filename']) - def backwards(self, orm): # Removing unique constraint on 'DocumentTypeFilename', fields ['document_type', 'filename'] db.delete_unique(u'documents_documenttypefilename', ['document_type_id', 'filename']) - models = { u'auth.group': { 'Meta': {'object_name': 'Group'}, @@ -113,4 +110,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['documents'] \ No newline at end of file + complete_apps = ['documents'] diff --git a/mayan/apps/documents/south_migrations/0031_remove_orphan_documents.py b/mayan/apps/documents/south_migrations/0031_remove_orphan_documents.py index 8b38a3bbf4..d1293e409f 100644 --- a/mayan/apps/documents/south_migrations/0031_remove_orphan_documents.py +++ b/mayan/apps/documents/south_migrations/0031_remove_orphan_documents.py @@ -1,5 +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 diff --git a/mayan/apps/documents/views.py b/mayan/apps/documents/views.py index acd95813d3..2c097d0be7 100644 --- a/mayan/apps/documents/views.py +++ b/mayan/apps/documents/views.py @@ -462,7 +462,6 @@ def document_multiple_download(request): def document_update_page_count(request, document_id=None, document_id_list=None): if document_id: documents = [get_object_or_404(Document.objects, pk=document_id)] - post_redirect = documents[0].get_absolute_url() elif document_id_list: documents = [get_object_or_404(Document, pk=document_id) for document_id in document_id_list.split(',')] else: diff --git a/mayan/apps/documents/widgets.py b/mayan/apps/documents/widgets.py index a3acf266f6..6563cad974 100644 --- a/mayan/apps/documents/widgets.py +++ b/mayan/apps/documents/widgets.py @@ -1,7 +1,6 @@ from __future__ import unicode_literals from django import forms -from django.conf import settings from django.contrib.staticfiles.templatetags.staticfiles import static from django.core.urlresolvers import reverse from django.utils.html import strip_tags diff --git a/mayan/apps/dynamic_search/tests.py b/mayan/apps/dynamic_search/tests.py index b6a37f0d3c..e09ec52140 100644 --- a/mayan/apps/dynamic_search/tests.py +++ b/mayan/apps/dynamic_search/tests.py @@ -1,8 +1,5 @@ from __future__ import unicode_literals -import os - -from django.conf import settings from django.contrib.auth.models import User from django.core.files.base import File from django.core.urlresolvers import reverse @@ -10,9 +7,10 @@ from django.test.client import Client from django.test import TestCase from documents.models import Document, DocumentType -from documents.tests import (TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, - TEST_ADMIN_EMAIL, TEST_DOCUMENT_PATH, - TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH) +from documents.tests import ( + TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL, + TEST_DOCUMENT_PATH, TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH +) from .classes import SearchModel @@ -40,7 +38,7 @@ class DocumentSearchTestCase(TestCase): document versions and document version pages """ - model_list, result_set, elapsed_time = document_search.search({'q':'Mayan'}, user=self.admin_user) + model_list, result_set, elapsed_time = document_search.search({'q': 'Mayan'}, user=self.admin_user) self.assertEqual(len(result_set), 1) self.assertEqual(model_list, [self.document]) diff --git a/mayan/apps/events/south_migrations/0001_initial.py b/mayan/apps/events/south_migrations/0001_initial.py index 01594af23e..c3d85fd450 100644 --- a/mayan/apps/events/south_migrations/0001_initial.py +++ b/mayan/apps/events/south_migrations/0001_initial.py @@ -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 @@ -15,12 +14,10 @@ class Migration(SchemaMigration): )) db.send_create_signal(u'events', ['EventType']) - def backwards(self, orm): # Deleting model 'EventType' db.delete_table(u'events_eventtype') - models = { u'events.eventtype': { 'Meta': {'object_name': 'EventType'}, @@ -29,4 +26,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['events'] \ No newline at end of file + complete_apps = ['events'] diff --git a/mayan/apps/events/south_migrations/0002_migrate_history_data.py b/mayan/apps/events/south_migrations/0002_migrate_history_data.py index df2de76d90..7f39550f18 100644 --- a/mayan/apps/events/south_migrations/0002_migrate_history_data.py +++ b/mayan/apps/events/south_migrations/0002_migrate_history_data.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- import json -from south.utils import datetime_utils as datetime from south.db import db from south.v2 import DataMigration from django.db import models diff --git a/mayan/apps/folders/south_migrations/0004_m2m_fields.py b/mayan/apps/folders/south_migrations/0004_m2m_fields.py index 65c9617f9a..6ee979bbb2 100644 --- a/mayan/apps/folders/south_migrations/0004_m2m_fields.py +++ b/mayan/apps/folders/south_migrations/0004_m2m_fields.py @@ -1,5 +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 diff --git a/mayan/apps/folders/south_migrations/0006_auto__chg_field_folder_datetime_created.py b/mayan/apps/folders/south_migrations/0006_auto__chg_field_folder_datetime_created.py index 99a631ece5..e1a36491cd 100644 --- a/mayan/apps/folders/south_migrations/0006_auto__chg_field_folder_datetime_created.py +++ b/mayan/apps/folders/south_migrations/0006_auto__chg_field_folder_datetime_created.py @@ -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 @@ -77,4 +76,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['folders'] \ No newline at end of file + complete_apps = ['folders'] diff --git a/mayan/apps/history/__init__.py b/mayan/apps/history/__init__.py index 8b13789179..e69de29bb2 100644 --- a/mayan/apps/history/__init__.py +++ b/mayan/apps/history/__init__.py @@ -1 +0,0 @@ - diff --git a/mayan/apps/history/south_migrations/0001_initial.py b/mayan/apps/history/south_migrations/0001_initial.py index 5774d664a9..6649ea1f20 100644 --- a/mayan/apps/history/south_migrations/0001_initial.py +++ b/mayan/apps/history/south_migrations/0001_initial.py @@ -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 @@ -30,7 +29,6 @@ class Migration(SchemaMigration): )) db.send_create_signal(u'history', ['History']) - def backwards(self, orm): # Removing unique constraint on 'HistoryType', fields ['namespace', 'name'] db.delete_unique(u'history_historytype', ['namespace', 'name']) @@ -41,7 +39,6 @@ class Migration(SchemaMigration): # Deleting model 'History' db.delete_table(u'history_history') - models = { u'contenttypes.contenttype': { 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, @@ -67,4 +64,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['history'] \ No newline at end of file + complete_apps = ['history'] diff --git a/mayan/apps/history/south_migrations/0002_auto__chg_field_history_datetime.py b/mayan/apps/history/south_migrations/0002_auto__chg_field_history_datetime.py index b17104b605..e76983e6ae 100644 --- a/mayan/apps/history/south_migrations/0002_auto__chg_field_history_datetime.py +++ b/mayan/apps/history/south_migrations/0002_auto__chg_field_history_datetime.py @@ -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 @@ -42,4 +41,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['history'] \ No newline at end of file + complete_apps = ['history'] diff --git a/mayan/apps/history/south_migrations/0003_auto__del_history__del_historytype__del_unique_historytype_namespace_n.py b/mayan/apps/history/south_migrations/0003_auto__del_history__del_historytype__del_unique_historytype_namespace_n.py index 0f86b89145..67d91cf3fd 100644 --- a/mayan/apps/history/south_migrations/0003_auto__del_history__del_historytype__del_unique_historytype_namespace_n.py +++ b/mayan/apps/history/south_migrations/0003_auto__del_history__del_historytype__del_unique_historytype_namespace_n.py @@ -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): # Deleting model 'HistoryType' db.delete_table(u'history_historytype') - def backwards(self, orm): # Adding model 'History' db.create_table(u'history_history', ( @@ -44,9 +42,6 @@ class Migration(SchemaMigration): # Adding unique constraint on 'HistoryType', fields ['namespace', 'name'] db.create_unique(u'history_historytype', ['namespace', 'name']) - - models = { - - } + models = {} complete_apps = ['history'] diff --git a/mayan/apps/linking/views.py b/mayan/apps/linking/views.py index 75d1c9a210..0cfdf8db6c 100644 --- a/mayan/apps/linking/views.py +++ b/mayan/apps/linking/views.py @@ -64,7 +64,8 @@ def smart_link_instances_for_document(request, document_id): queryset = SmartLink.objects.get_for(document) except Exception as exception: queryset = [] - messages.error(request, _('Error calculating smart link for: %(document)s; %(exception)s.') % + messages.error( + request, _('Error calculating smart link for: %(document)s; %(exception)s.') % {'document': document, 'exception': exception} ) diff --git a/mayan/apps/lock_manager/south_migrations/0001_initial.py b/mayan/apps/lock_manager/south_migrations/0001_initial.py index 736c3a76fe..dd6637e508 100644 --- a/mayan/apps/lock_manager/south_migrations/0001_initial.py +++ b/mayan/apps/lock_manager/south_migrations/0001_initial.py @@ -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 diff --git a/mayan/apps/lock_manager/south_migrations/0002_auto__chg_field_lock_creation_datetime.py b/mayan/apps/lock_manager/south_migrations/0002_auto__chg_field_lock_creation_datetime.py index 809f43d358..bb5d8c25b0 100644 --- a/mayan/apps/lock_manager/south_migrations/0002_auto__chg_field_lock_creation_datetime.py +++ b/mayan/apps/lock_manager/south_migrations/0002_auto__chg_field_lock_creation_datetime.py @@ -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 @@ -27,4 +26,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['lock_manager'] \ No newline at end of file + complete_apps = ['lock_manager'] diff --git a/mayan/apps/main/views.py b/mayan/apps/main/views.py index 83c55f801b..9054f42996 100644 --- a/mayan/apps/main/views.py +++ b/mayan/apps/main/views.py @@ -1,8 +1,6 @@ from __future__ import absolute_import, unicode_literals from django.core.exceptions import PermissionDenied -from django.core.urlresolvers import reverse -from django.http import HttpResponseRedirect from django.shortcuts import render_to_response from django.template import RequestContext from django.utils.translation import ugettext_lazy as _ diff --git a/mayan/apps/metadata/api_views.py b/mayan/apps/metadata/api_views.py index f76f11f546..da59e546d3 100644 --- a/mayan/apps/metadata/api_views.py +++ b/mayan/apps/metadata/api_views.py @@ -4,7 +4,6 @@ from django.core.exceptions import PermissionDenied from django.shortcuts import get_object_or_404 from rest_framework import generics, status, views -from rest_framework.parsers import JSONParser from rest_framework.response import Response from acls.models import AccessEntry @@ -12,7 +11,6 @@ from documents.models import Document, DocumentType from documents.permissions import ( PERMISSION_DOCUMENT_TYPE_VIEW, PERMISSION_DOCUMENT_TYPE_EDIT ) - from permissions.models import Permission from rest_api.filters import MayanObjectPermissionsFilter from rest_api.permissions import MayanPermission @@ -25,9 +23,8 @@ from .permissions import ( PERMISSION_METADATA_TYPE_EDIT, PERMISSION_METADATA_TYPE_VIEW ) from .serializers import ( - DocumentMetadataSerializer, DocumentNewMetadataSerializer, - DocumentTypeNewMetadataTypeSerializer, MetadataTypeSerializer, - DocumentTypeMetadataTypeSerializer + DocumentMetadataSerializer, DocumentTypeNewMetadataTypeSerializer, + MetadataTypeSerializer, DocumentTypeMetadataTypeSerializer ) @@ -155,7 +152,6 @@ class APIDocumentMetadataView(generics.RetrieveUpdateDestroyAPIView): return Response(status=status.HTTP_400_BAD_REQUEST, data={'non_fields_errors': unicode(exception)}) - class APIDocumentTypeMetadataTypeOptionalListView(generics.ListCreateAPIView): permission_classes = (MayanPermission,) diff --git a/mayan/apps/metadata/south_migrations/0004_auto__del_metadataset__del_metadatasetitem__chg_field_documentmetadata.py b/mayan/apps/metadata/south_migrations/0004_auto__del_metadataset__del_metadatasetitem__chg_field_documentmetadata.py index c0e68e8214..e16b3bba55 100644 --- a/mayan/apps/metadata/south_migrations/0004_auto__del_metadataset__del_metadatasetitem__chg_field_documentmetadata.py +++ b/mayan/apps/metadata/south_migrations/0004_auto__del_metadataset__del_metadatasetitem__chg_field_documentmetadata.py @@ -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,7 +16,6 @@ class Migration(SchemaMigration): # Removing M2M table for field default_metadata_sets on 'DocumentTypeDefaults' db.delete_table(db.shorten_name(u'metadata_documenttypedefaults_default_metadata_sets')) - # Changing field 'DocumentMetadata.value' db.alter_column(u'metadata_documentmetadata', 'value', self.gf('django.db.models.fields.CharField')(max_length=255)) @@ -46,7 +44,6 @@ class Migration(SchemaMigration): )) db.create_unique(m2m_table_name, ['documenttypedefaults_id', 'metadataset_id']) - # Changing field 'DocumentMetadata.value' db.alter_column(u'metadata_documentmetadata', 'value', self.gf('django.db.models.fields.CharField')(max_length=256)) @@ -88,4 +85,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['metadata'] \ No newline at end of file + complete_apps = ['metadata'] diff --git a/mayan/apps/metadata/south_migrations/0005_auto__chg_field_documentmetadata_value.py b/mayan/apps/metadata/south_migrations/0005_auto__chg_field_documentmetadata_value.py index fdf18cc3f0..749b0d9ab0 100644 --- a/mayan/apps/metadata/south_migrations/0005_auto__chg_field_documentmetadata_value.py +++ b/mayan/apps/metadata/south_migrations/0005_auto__chg_field_documentmetadata_value.py @@ -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 @@ -57,4 +56,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['metadata'] \ No newline at end of file + complete_apps = ['metadata'] diff --git a/mayan/apps/metadata/south_migrations/0006_auto__add_documenttypemetadatatypeoptions.py b/mayan/apps/metadata/south_migrations/0006_auto__add_documenttypemetadatatypeoptions.py index 0f2d0c2421..5ba5a66cd9 100644 --- a/mayan/apps/metadata/south_migrations/0006_auto__add_documenttypemetadatatypeoptions.py +++ b/mayan/apps/metadata/south_migrations/0006_auto__add_documenttypemetadatatypeoptions.py @@ -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): # Removing M2M table for field default_metadata on 'DocumentTypeDefaults' db.delete_table(db.shorten_name(u'metadata_documenttypedefaults_default_metadata')) - def backwards(self, orm): # Deleting model 'DocumentTypeMetadataTypeOptions' db.delete_table(u'metadata_documenttypemetadatatypeoptions') @@ -34,7 +32,6 @@ class Migration(SchemaMigration): )) db.create_unique(m2m_table_name, ['documenttypedefaults_id', 'metadatatype_id']) - models = { u'documents.document': { 'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'}, @@ -82,4 +79,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['metadata'] \ No newline at end of file + complete_apps = ['metadata'] diff --git a/mayan/apps/metadata/south_migrations/0007_auto__del_documenttypedefaults__del_documenttypemetadatatypeoptions__a.py b/mayan/apps/metadata/south_migrations/0007_auto__del_documenttypedefaults__del_documenttypemetadatatypeoptions__a.py index f84d116968..3ee5983e14 100644 --- a/mayan/apps/metadata/south_migrations/0007_auto__del_documenttypedefaults__del_documenttypemetadatatypeoptions__a.py +++ b/mayan/apps/metadata/south_migrations/0007_auto__del_documenttypedefaults__del_documenttypemetadatatypeoptions__a.py @@ -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 @@ -23,7 +22,6 @@ class Migration(SchemaMigration): )) db.send_create_signal(u'metadata', ['DocumentTypeMetadataType']) - def backwards(self, orm): # Adding model 'DocumentTypeDefaults' db.create_table(u'metadata_documenttypedefaults', ( @@ -44,7 +42,6 @@ class Migration(SchemaMigration): # Deleting model 'DocumentTypeMetadataType' db.delete_table(u'metadata_documenttypemetadatatype') - models = { u'documents.document': { 'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'}, @@ -86,4 +83,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['metadata'] \ No newline at end of file + complete_apps = ['metadata'] diff --git a/mayan/apps/metadata/south_migrations/0008_auto__add_unique_documenttypemetadatatype_document_type_metadata_type.py b/mayan/apps/metadata/south_migrations/0008_auto__add_unique_documenttypemetadatatype_document_type_metadata_type.py index 76582cdd2d..5adc099a0f 100644 --- a/mayan/apps/metadata/south_migrations/0008_auto__add_unique_documenttypemetadatatype_document_type_metadata_type.py +++ b/mayan/apps/metadata/south_migrations/0008_auto__add_unique_documenttypemetadatatype_document_type_metadata_type.py @@ -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,12 +10,10 @@ class Migration(SchemaMigration): # Adding unique constraint on 'DocumentTypeMetadataType', fields ['document_type', 'metadata_type'] db.create_unique(u'metadata_documenttypemetadatatype', ['document_type_id', 'metadata_type_id']) - def backwards(self, orm): # Removing unique constraint on 'DocumentTypeMetadataType', fields ['document_type', 'metadata_type'] db.delete_unique(u'metadata_documenttypemetadatatype', ['document_type_id', 'metadata_type_id']) - models = { u'documents.document': { 'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'}, @@ -58,4 +55,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['metadata'] \ No newline at end of file + complete_apps = ['metadata'] diff --git a/mayan/apps/metadata/south_migrations/0009_auto__chg_field_metadatatype_title.py b/mayan/apps/metadata/south_migrations/0009_auto__chg_field_metadatatype_title.py index cee64e15a1..01378a8b86 100644 --- a/mayan/apps/metadata/south_migrations/0009_auto__chg_field_metadatatype_title.py +++ b/mayan/apps/metadata/south_migrations/0009_auto__chg_field_metadatatype_title.py @@ -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 @@ -58,4 +57,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['metadata'] \ No newline at end of file + complete_apps = ['metadata'] diff --git a/mayan/apps/metadata/south_migrations/0010_auto__add_unique_documentmetadata_document_metadata_type.py b/mayan/apps/metadata/south_migrations/0010_auto__add_unique_documentmetadata_document_metadata_type.py index 289d5c53be..7b6c4f4841 100644 --- a/mayan/apps/metadata/south_migrations/0010_auto__add_unique_documentmetadata_document_metadata_type.py +++ b/mayan/apps/metadata/south_migrations/0010_auto__add_unique_documentmetadata_document_metadata_type.py @@ -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,12 +10,10 @@ class Migration(SchemaMigration): # Adding unique constraint on 'DocumentMetadata', fields ['document', 'metadata_type'] db.create_unique(u'metadata_documentmetadata', ['document_id', 'metadata_type_id']) - def backwards(self, orm): # Removing unique constraint on 'DocumentMetadata', fields ['document', 'metadata_type'] db.delete_unique(u'metadata_documentmetadata', ['document_id', 'metadata_type_id']) - models = { u'documents.document': { 'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'}, @@ -58,4 +55,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['metadata'] \ No newline at end of file + complete_apps = ['metadata'] diff --git a/mayan/apps/metadata/south_migrations/0011_auto__add_field_metadatatype_validation.py b/mayan/apps/metadata/south_migrations/0011_auto__add_field_metadatatype_validation.py index 8bd44a7f0a..19d4ffb036 100644 --- a/mayan/apps/metadata/south_migrations/0011_auto__add_field_metadatatype_validation.py +++ b/mayan/apps/metadata/south_migrations/0011_auto__add_field_metadatatype_validation.py @@ -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='', max_length=64), keep_default=False) - def backwards(self, orm): # Deleting field 'MetadataType.validation' db.delete_column(u'metadata_metadatatype', 'validation') - models = { u'documents.document': { 'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'}, @@ -61,4 +58,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['metadata'] \ No newline at end of file + complete_apps = ['metadata'] diff --git a/mayan/apps/metadata/tasks.py b/mayan/apps/metadata/tasks.py index 9ec391d0cc..fcc1a8cdf5 100644 --- a/mayan/apps/metadata/tasks.py +++ b/mayan/apps/metadata/tasks.py @@ -20,4 +20,3 @@ def task_add_required_metadata_type(document_type_id, metadata_type_id): for document in DocumentType.objects.get(pk=document_type_id).documents.all(): document.metadata.create(metadata_type=metadata_type) - diff --git a/mayan/apps/metadata/views.py b/mayan/apps/metadata/views.py index 8251804f48..02b3072ff8 100644 --- a/mayan/apps/metadata/views.py +++ b/mayan/apps/metadata/views.py @@ -5,16 +5,16 @@ from django.contrib import messages from django.core.exceptions import PermissionDenied from django.core.urlresolvers import reverse from django.http import HttpResponseRedirect, Http404 -from django.shortcuts import (get_list_or_404, get_object_or_404, - render_to_response) +from django.shortcuts import get_object_or_404, render_to_response from django.template import RequestContext from django.utils.http import urlencode from django.utils.translation import ugettext_lazy as _, ungettext from acls.models import AccessEntry from documents.models import Document, DocumentType -from documents.permissions import (PERMISSION_DOCUMENT_TYPE_EDIT, - PERMISSION_DOCUMENT_VIEW) +from documents.permissions import ( + PERMISSION_DOCUMENT_TYPE_EDIT, PERMISSION_DOCUMENT_VIEW +) from documents.views import document_list from permissions.models import Permission @@ -56,7 +56,7 @@ def metadata_edit(request, document_id=None, document_id_list=None): messages.error(request, _('Only select documents of the same type.')) return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse('main:home'))) - if set(documents.values_list('metadata__value' ,flat=True)) == set([None]): + if set(documents.values_list('metadata__value', flat=True)) == set([None]): message = ungettext( 'The selected document doesn\'t have any metadata.', 'The selected documents don\'t have any metadata.', @@ -228,9 +228,9 @@ def metadata_remove(request, document_id=None, document_id_list=None): documents = Document.objects.select_related('metadata').filter(pk__in=document_id_list.split(',')) try: - Permission.objects.check_permissions(request.user, [PERMISSION_METADATA_DOCUMENT_EDIT]) + Permission.objects.check_permissions(request.user, [PERMISSION_METADATA_DOCUMENT_REMOVE]) except PermissionDenied: - documents = AccessEntry.objects.filter_objects_by_access(PERMISSION_METADATA_DOCUMENT_EDIT, request.user, documents) + documents = AccessEntry.objects.filter_objects_by_access(PERMISSION_METADATA_DOCUMENT_REMOVE, request.user, documents) if not documents: if document_id: @@ -243,7 +243,7 @@ def metadata_remove(request, document_id=None, document_id_list=None): messages.error(request, _('Only select documents of the same type.')) return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse('main:home'))) - if set(documents.values_list('metadata__value' ,flat=True)) == set([None]): + if set(documents.values_list('metadata__value', flat=True)) == set([None]): message = ungettext( 'The selected document doesn\'t have any metadata.', 'The selected documents doesn\'t have any metadata.', diff --git a/mayan/apps/ocr/south_migrations/0003_auto__chg_field_queuedocument_node_name__chg_field_queuedocument_datet.py b/mayan/apps/ocr/south_migrations/0003_auto__chg_field_queuedocument_node_name__chg_field_queuedocument_datet.py index a2b211c708..dabda93f6a 100644 --- a/mayan/apps/ocr/south_migrations/0003_auto__chg_field_queuedocument_node_name__chg_field_queuedocument_datet.py +++ b/mayan/apps/ocr/south_migrations/0003_auto__chg_field_queuedocument_node_name__chg_field_queuedocument_datet.py @@ -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 @@ -57,4 +56,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['ocr'] \ No newline at end of file + complete_apps = ['ocr'] diff --git a/mayan/apps/ocr/south_migrations/0004_auto__del_documentqueue__del_queuedocument__add_documentversionocrerro.py b/mayan/apps/ocr/south_migrations/0004_auto__del_documentqueue__del_queuedocument__add_documentversionocrerro.py index ff4777e7ca..72b292ff23 100644 --- a/mayan/apps/ocr/south_migrations/0004_auto__del_documentqueue__del_queuedocument__add_documentversionocrerro.py +++ b/mayan/apps/ocr/south_migrations/0004_auto__del_documentqueue__del_queuedocument__add_documentversionocrerro.py @@ -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 @@ -23,7 +22,6 @@ class Migration(SchemaMigration): )) db.send_create_signal(u'ocr', ['DocumentVersionOCRError']) - def backwards(self, orm): # Adding model 'DocumentQueue' db.create_table(u'ocr_documentqueue', ( @@ -47,7 +45,6 @@ class Migration(SchemaMigration): # Deleting model 'DocumentVersionOCRError' db.delete_table(u'ocr_documentversionocrerror') - models = { u'documents.document': { 'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'}, @@ -85,4 +82,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['ocr'] \ No newline at end of file + complete_apps = ['ocr'] diff --git a/mayan/apps/permissions/api_views.py b/mayan/apps/permissions/api_views.py index 6d6fb9d1dd..900fd771c9 100644 --- a/mayan/apps/permissions/api_views.py +++ b/mayan/apps/permissions/api_views.py @@ -1,13 +1,15 @@ from __future__ import unicode_literals -from rest_framework import generics, views +from rest_framework import generics from rest_api.filters import MayanObjectPermissionsFilter from rest_api.permissions import MayanPermission from .models import Role -from .permissions import (PERMISSION_ROLE_CREATE, PERMISSION_ROLE_DELETE, - PERMISSION_ROLE_EDIT, PERMISSION_ROLE_VIEW) +from .permissions import ( + PERMISSION_ROLE_CREATE, PERMISSION_ROLE_DELETE, PERMISSION_ROLE_EDIT, + PERMISSION_ROLE_VIEW +) from .serializers import RoleSerializer diff --git a/mayan/apps/permissions/views.py b/mayan/apps/permissions/views.py index 6e39599697..6ea4ba09e5 100644 --- a/mayan/apps/permissions/views.py +++ b/mayan/apps/permissions/views.py @@ -61,7 +61,7 @@ def role_list(request): } return render_to_response('main/generic_list.html', context, - context_instance=RequestContext(request)) + context_instance=RequestContext(request)) def role_permissions(request, role_id): @@ -106,7 +106,6 @@ def role_permissions(request, role_id): def permission_grant(request): Permission.objects.check_permissions(request.user, [PERMISSION_PERMISSION_GRANT]) items_property_list = loads(request.GET.get('items_property_list', [])) - post_action_redirect = None next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))) @@ -161,13 +160,12 @@ def permission_grant(request): context['object'] = grouped_items[0][0] return render_to_response('main/generic_confirm.html', context, - context_instance=RequestContext(request)) + context_instance=RequestContext(request)) def permission_revoke(request): Permission.objects.check_permissions(request.user, [PERMISSION_PERMISSION_REVOKE]) items_property_list = loads(request.GET.get('items_property_list', [])) - post_action_redirect = None next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', None))) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', None))) @@ -222,7 +220,7 @@ def permission_revoke(request): context['object'] = grouped_items[0][0] return render_to_response('main/generic_confirm.html', context, - context_instance=RequestContext(request)) + context_instance=RequestContext(request)) class Member(EncapsulatedObject): diff --git a/mayan/apps/project_setup/views.py b/mayan/apps/project_setup/views.py index 1fc59fc300..d2917c20e2 100644 --- a/mayan/apps/project_setup/views.py +++ b/mayan/apps/project_setup/views.py @@ -14,4 +14,4 @@ def setup_list(request): } return render_to_response('main/generic_list_horizontal.html', context, - context_instance=RequestContext(request)) + context_instance=RequestContext(request)) diff --git a/mayan/apps/project_tools/views.py b/mayan/apps/project_tools/views.py index f72f90e660..c64c573e9c 100644 --- a/mayan/apps/project_tools/views.py +++ b/mayan/apps/project_tools/views.py @@ -14,4 +14,4 @@ def tools_list(request): } return render_to_response('main/generic_list_horizontal.html', context, - context_instance=RequestContext(request)) + context_instance=RequestContext(request)) diff --git a/mayan/apps/smart_settings/views.py b/mayan/apps/smart_settings/views.py index 698bc17ae5..4d96fa2611 100644 --- a/mayan/apps/smart_settings/views.py +++ b/mayan/apps/smart_settings/views.py @@ -42,4 +42,4 @@ def setting_list(request): } return render_to_response('main/generic_list.html', context, - context_instance=RequestContext(request)) + context_instance=RequestContext(request)) diff --git a/mayan/apps/sources/forms.py b/mayan/apps/sources/forms.py index f1e7559bdd..1917c3f73b 100644 --- a/mayan/apps/sources/forms.py +++ b/mayan/apps/sources/forms.py @@ -7,7 +7,6 @@ from django.utils.translation import ugettext from django.utils.translation import ugettext_lazy as _ from documents.forms import DocumentForm -from documents.models import DocumentVersion from .models import ( IMAPEmail, POP3Email, SourceTransformation, StagingFolderSource, @@ -24,7 +23,6 @@ class NewDocumentForm(DocumentForm): class NewVersionForm(forms.Form): def __init__(self, *args, **kwargs): - document = kwargs.pop('document') super(NewVersionForm, self).__init__(*args, **kwargs) self.fields['comment'] = forms.CharField( diff --git a/mayan/apps/sources/south_migrations/0005_auto__add_imapemail__add_intervalbasemodel__add_pop3email__add_emailba.py b/mayan/apps/sources/south_migrations/0005_auto__add_imapemail__add_intervalbasemodel__add_pop3email__add_emailba.py index 24ec380847..5ac64256b3 100644 --- a/mayan/apps/sources/south_migrations/0005_auto__add_imapemail__add_intervalbasemodel__add_pop3email__add_emailba.py +++ b/mayan/apps/sources/south_migrations/0005_auto__add_imapemail__add_intervalbasemodel__add_pop3email__add_emailba.py @@ -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 @@ -42,7 +41,6 @@ class Migration(SchemaMigration): )) db.send_create_signal(u'sources', ['EmailBaseModel']) - def backwards(self, orm): # Deleting model 'IMAPEmail' db.delete_table(u'sources_imapemail') @@ -56,7 +54,6 @@ class Migration(SchemaMigration): # Deleting model 'EmailBaseModel' db.delete_table(u'sources_emailbasemodel') - models = { u'contenttypes.contenttype': { 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, @@ -145,4 +142,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['sources'] \ No newline at end of file + complete_apps = ['sources'] diff --git a/mayan/apps/sources/south_migrations/0006_auto__del_field_source_whitelist__del_field_source_blacklist.py b/mayan/apps/sources/south_migrations/0006_auto__del_field_source_whitelist__del_field_source_blacklist.py index 2f9ba2d458..9c561a731d 100644 --- a/mayan/apps/sources/south_migrations/0006_auto__del_field_source_whitelist__del_field_source_blacklist.py +++ b/mayan/apps/sources/south_migrations/0006_auto__del_field_source_whitelist__del_field_source_blacklist.py @@ -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 diff --git a/mayan/apps/sources/south_migrations/0008_auto__chg_field_intervalbasemodel_document_type.py b/mayan/apps/sources/south_migrations/0008_auto__chg_field_intervalbasemodel_document_type.py index 2d83b1637f..be4389b91a 100644 --- a/mayan/apps/sources/south_migrations/0008_auto__chg_field_intervalbasemodel_document_type.py +++ b/mayan/apps/sources/south_migrations/0008_auto__chg_field_intervalbasemodel_document_type.py @@ -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 diff --git a/mayan/apps/sources/south_migrations/0011_auto__del_field_intervalbasemodel_document_type.py b/mayan/apps/sources/south_migrations/0011_auto__del_field_intervalbasemodel_document_type.py index 12aec323f9..97b09129ab 100644 --- a/mayan/apps/sources/south_migrations/0011_auto__del_field_intervalbasemodel_document_type.py +++ b/mayan/apps/sources/south_migrations/0011_auto__del_field_intervalbasemodel_document_type.py @@ -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 diff --git a/mayan/apps/sources/south_migrations/0012_auto__add_field_intervalbasemodel_document_type.py b/mayan/apps/sources/south_migrations/0012_auto__add_field_intervalbasemodel_document_type.py index 87f8e73200..bf3769a77b 100644 --- a/mayan/apps/sources/south_migrations/0012_auto__add_field_intervalbasemodel_document_type.py +++ b/mayan/apps/sources/south_migrations/0012_auto__add_field_intervalbasemodel_document_type.py @@ -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 diff --git a/mayan/apps/sources/south_migrations/0013_auto__del_field_watchfoldersource_delete_after_upload.py b/mayan/apps/sources/south_migrations/0013_auto__del_field_watchfoldersource_delete_after_upload.py index 9bc18ab1c4..4a42da1738 100644 --- a/mayan/apps/sources/south_migrations/0013_auto__del_field_watchfoldersource_delete_after_upload.py +++ b/mayan/apps/sources/south_migrations/0013_auto__del_field_watchfoldersource_delete_after_upload.py @@ -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 diff --git a/mayan/apps/sources/tests.py b/mayan/apps/sources/tests.py index 55ceddd62f..97505e167b 100644 --- a/mayan/apps/sources/tests.py +++ b/mayan/apps/sources/tests.py @@ -1,10 +1,6 @@ from __future__ import unicode_literals -from json import loads - -from django.conf import settings from django.contrib.auth.models import User -from django.core.files.base import File from django.core.urlresolvers import reverse from django.test.client import Client from django.test import TestCase @@ -13,11 +9,12 @@ from documents.models import Document, DocumentType from sources.literals import SOURCE_CHOICE_WEB_FORM from sources.models import WebFormSource -from documents.tests import (TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, - TEST_ADMIN_EMAIL, TEST_SMALL_DOCUMENT_FILENAME, - TEST_DOCUMENT_PATH, TEST_SIGNED_DOCUMENT_PATH, - TEST_SMALL_DOCUMENT_PATH, - TEST_DOCUMENT_DESCRIPTION, TEST_DOCUMENT_TYPE) +from documents.tests import ( + TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL, + TEST_SMALL_DOCUMENT_FILENAME, TEST_DOCUMENT_PATH, + TEST_SIGNED_DOCUMENT_PATH, TEST_SMALL_DOCUMENT_PATH, + TEST_DOCUMENT_DESCRIPTION, TEST_DOCUMENT_TYPE +) class UploadDocumentTestCase(TestCase): diff --git a/mayan/apps/sources/widgets.py b/mayan/apps/sources/widgets.py index 45cee88550..30836c80ce 100644 --- a/mayan/apps/sources/widgets.py +++ b/mayan/apps/sources/widgets.py @@ -1,6 +1,5 @@ from __future__ import unicode_literals -from django.conf import settings from django.contrib.staticfiles.templatetags.staticfiles import static from django.core.urlresolvers import reverse from django.utils.html import strip_tags diff --git a/mayan/apps/tags/views.py b/mayan/apps/tags/views.py index 26b5ab120b..f946d5df7d 100644 --- a/mayan/apps/tags/views.py +++ b/mayan/apps/tags/views.py @@ -32,7 +32,6 @@ logger = logging.getLogger(__name__) def tag_create(request): Permission.objects.check_permissions(request.user, [PERMISSION_TAG_CREATE]) redirect_url = reverse('tags:tag_list') - previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', redirect_url))) if request.method == 'POST': form = TagForm(request.POST) diff --git a/mayan/apps/user_management/__init__.py b/mayan/apps/user_management/__init__.py index 9edeceeff7..b8c598288d 100644 --- a/mayan/apps/user_management/__init__.py +++ b/mayan/apps/user_management/__init__.py @@ -2,9 +2,7 @@ from __future__ import unicode_literals from django.contrib.auth.models import User, Group - from navigation.api import register_links -from navigation.links import link_spacer from project_setup.api import register_setup from rest_api.classes import APIEndPoint @@ -27,5 +25,3 @@ register_setup(user_setup) register_setup(group_setup) APIEndPoint('users', app_name='user_management') - -