From ec223dd54dc95226f4ad414efbaeb8dcbb3958b3 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sun, 27 Aug 2017 02:08:39 -0400 Subject: [PATCH] PEP8 cleanups. Signed-off-by: Roberto Rosario --- mayan/apps/acls/tests/test_actions.py | 1 - mayan/apps/acls/tests/test_models.py | 14 -------------- mayan/apps/acls/workflow_actions.py | 1 - mayan/apps/authentication/tests/test_views.py | 6 ------ mayan/apps/cabinets/tests/test_views.py | 1 - mayan/apps/checkouts/tests/test_models.py | 9 --------- mayan/apps/common/managers.py | 1 - mayan/apps/common/permissions_runtime.py | 1 - mayan/apps/common/tests/test_views.py | 8 ++------ mayan/apps/document_states/forms.py | 4 ---- .../document_states/tests/test_actions.py | 1 + .../apps/dynamic_search/tests/test_models.py | 8 -------- mayan/apps/mailer/mailers.py | 2 -- mayan/apps/permissions/models.py | 4 ++-- mayan/apps/permissions/tests/test_models.py | 11 ----------- mayan/apps/permissions/tests/test_views.py | 19 +++++-------------- mayan/apps/sources/tests/test_models.py | 10 ---------- mayan/apps/tags/workflow_actions.py | 7 +++++-- 18 files changed, 15 insertions(+), 93 deletions(-) diff --git a/mayan/apps/acls/tests/test_actions.py b/mayan/apps/acls/tests/test_actions.py index d2a2020b22..c99d9f85b1 100644 --- a/mayan/apps/acls/tests/test_actions.py +++ b/mayan/apps/acls/tests/test_actions.py @@ -5,7 +5,6 @@ from django.contrib.contenttypes.models import ContentType from document_states.tests.test_actions import ActionTestCase from documents.permissions import permission_document_view -from ..models import AccessControlList from ..workflow_actions import GrantAccessAction, RevokeAccessAction diff --git a/mayan/apps/acls/tests/test_models.py b/mayan/apps/acls/tests/test_models.py index b238966819..72063bedb7 100644 --- a/mayan/apps/acls/tests/test_models.py +++ b/mayan/apps/acls/tests/test_models.py @@ -1,7 +1,5 @@ from __future__ import absolute_import, unicode_literals -from django.contrib.auth import get_user_model -from django.contrib.auth.models import Group from django.core.exceptions import PermissionDenied from django.test import override_settings @@ -12,9 +10,6 @@ from documents.tests import ( TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE_LABEL, TEST_DOCUMENT_TYPE_2_LABEL ) -from permissions.models import Role -from permissions.tests.literals import TEST_ROLE_LABEL -from user_management.tests.literals import TEST_USER_USERNAME, TEST_GROUP_NAME from ..models import AccessControlList @@ -46,15 +41,6 @@ class PermissionTestCase(BaseTestCase): file_object=file_object ) - self.user = get_user_model().objects.create( - username=TEST_USER_USERNAME - ) - self.group = Group.objects.create(name=TEST_GROUP_NAME) - self.role = Role.objects.create(label=TEST_ROLE_LABEL) - - self.group.user_set.add(self.user) - self.role.groups.add(self.group) - def tearDown(self): for document_type in DocumentType.objects.all(): document_type.delete() diff --git a/mayan/apps/acls/workflow_actions.py b/mayan/apps/acls/workflow_actions.py index 6ddfdd38fd..60cc5838f0 100644 --- a/mayan/apps/acls/workflow_actions.py +++ b/mayan/apps/acls/workflow_actions.py @@ -1,7 +1,6 @@ from __future__ import absolute_import, unicode_literals import logging -from collections import OrderedDict from django.apps import apps from django.contrib.contenttypes.models import ContentType diff --git a/mayan/apps/authentication/tests/test_views.py b/mayan/apps/authentication/tests/test_views.py index 4958edc0f7..49e6186304 100644 --- a/mayan/apps/authentication/tests/test_views.py +++ b/mayan/apps/authentication/tests/test_views.py @@ -1,7 +1,6 @@ from __future__ import absolute_import, unicode_literals from django.conf import settings -from django.contrib.auth import get_user_model from django.core import mail from django.test import override_settings from django.urls import reverse @@ -25,11 +24,6 @@ class UserLoginTestCase(BaseTestCase): def setUp(self): super(UserLoginTestCase, self).setUp() - - self.admin_user = get_user_model().objects.create_superuser( - username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL, - password=TEST_ADMIN_PASSWORD - ) Namespace.invalidate_cache_all() @override_settings(AUTHENTICATION_LOGIN_METHOD='username') diff --git a/mayan/apps/cabinets/tests/test_views.py b/mayan/apps/cabinets/tests/test_views.py index be4e59249d..d47acaf3d4 100644 --- a/mayan/apps/cabinets/tests/test_views.py +++ b/mayan/apps/cabinets/tests/test_views.py @@ -1,6 +1,5 @@ from __future__ import absolute_import, unicode_literals -from documents.permissions import permission_document_view from documents.tests.test_views import GenericDocumentViewTestCase from ..models import Cabinet diff --git a/mayan/apps/checkouts/tests/test_models.py b/mayan/apps/checkouts/tests/test_models.py index b253a46f3e..bbf6659778 100644 --- a/mayan/apps/checkouts/tests/test_models.py +++ b/mayan/apps/checkouts/tests/test_models.py @@ -4,7 +4,6 @@ import datetime import logging import time -from django.contrib.auth import get_user_model from django.test import override_settings from django.utils.timezone import now @@ -13,9 +12,6 @@ from documents.models import DocumentType from documents.tests.literals import ( TEST_DOCUMENT_TYPE_LABEL, TEST_SMALL_DOCUMENT_PATH ) -from user_management.tests.literals import ( - TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD -) from ..exceptions import ( DocumentAlreadyCheckedOut, DocumentNotCheckedOut, @@ -28,11 +24,6 @@ from ..models import DocumentCheckout, NewVersionBlock class DocumentCheckoutTestCase(BaseTestCase): def setUp(self): super(DocumentCheckoutTestCase, self).setUp() - self.admin_user = get_user_model().objects.create_superuser( - username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL, - password=TEST_ADMIN_PASSWORD - ) - self.document_type = DocumentType.objects.create( label=TEST_DOCUMENT_TYPE_LABEL ) diff --git a/mayan/apps/common/managers.py b/mayan/apps/common/managers.py index dbc93c3c63..c99c8f631d 100644 --- a/mayan/apps/common/managers.py +++ b/mayan/apps/common/managers.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals from django.apps import apps from django.contrib.contenttypes.fields import GenericRelation -from django.conf import settings from django.db import models diff --git a/mayan/apps/common/permissions_runtime.py b/mayan/apps/common/permissions_runtime.py index 0b62fcb58f..70ead0f5bf 100644 --- a/mayan/apps/common/permissions_runtime.py +++ b/mayan/apps/common/permissions_runtime.py @@ -9,4 +9,3 @@ namespace = PermissionNamespace('common', _('Common')) permission_error_log_view = namespace.add_permission( name='error_log_view', label=_('View errorr log') ) - diff --git a/mayan/apps/common/tests/test_views.py b/mayan/apps/common/tests/test_views.py index 5331311001..82e09510e1 100644 --- a/mayan/apps/common/tests/test_views.py +++ b/mayan/apps/common/tests/test_views.py @@ -2,18 +2,14 @@ from __future__ import absolute_import, unicode_literals from django.conf.urls import url from django.contrib.auth import get_user_model -from django.contrib.auth.models import Group from django.http import HttpResponse from django.template import Context, Template from django.test.utils import ContextList from django.urls import clear_url_caches, reverse -from acls.models import AccessControlList -from permissions.models import Role -from permissions.tests.literals import TEST_ROLE_LABEL from user_management.tests import ( - TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL, - TEST_GROUP_NAME, TEST_USER_EMAIL, TEST_USER_USERNAME, TEST_USER_PASSWORD + TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_USER_USERNAME, + TEST_USER_PASSWORD ) from .base import BaseTestCase diff --git a/mayan/apps/document_states/forms.py b/mayan/apps/document_states/forms.py index b71cd3e718..b3b4a7df16 100644 --- a/mayan/apps/document_states/forms.py +++ b/mayan/apps/document_states/forms.py @@ -76,10 +76,6 @@ class WorkflowStateActionDynamicForm(DynamicModelForm): action_data[field_name] = action_data[field_name].pk data['action_data'] = action_data - #data = self.instance.get_class().clean( - # form_data=data, request=self.request - #) - data = import_string(self.action_path).clean( form_data=data, request=self.request ) diff --git a/mayan/apps/document_states/tests/test_actions.py b/mayan/apps/document_states/tests/test_actions.py index 393325aea4..9efbe58405 100644 --- a/mayan/apps/document_states/tests/test_actions.py +++ b/mayan/apps/document_states/tests/test_actions.py @@ -6,6 +6,7 @@ from documents.tests.test_models import GenericDocumentTestCase class ActionTestCase(GenericDocumentTestCase): def setUp(self): super(ActionTestCase, self).setUp() + class MockWorkflowInstance(object): document = self.document diff --git a/mayan/apps/dynamic_search/tests/test_models.py b/mayan/apps/dynamic_search/tests/test_models.py index dd6779f4e8..aae37e9558 100644 --- a/mayan/apps/dynamic_search/tests/test_models.py +++ b/mayan/apps/dynamic_search/tests/test_models.py @@ -1,25 +1,17 @@ from __future__ import unicode_literals -from django.contrib.auth import get_user_model from django.test import override_settings from common.tests import BaseTestCase from documents.models import DocumentType from documents.search import document_search from documents.tests import TEST_DOCUMENT_TYPE_LABEL, TEST_SMALL_DOCUMENT_PATH -from user_management.tests import ( - TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL -) @override_settings(OCR_AUTO_OCR=False) class DocumentSearchTestCase(BaseTestCase): def setUp(self): super(DocumentSearchTestCase, self).setUp() - self.admin_user = get_user_model().objects.create_superuser( - username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL, - password=TEST_ADMIN_PASSWORD - ) self.document_type = DocumentType.objects.create( label=TEST_DOCUMENT_TYPE_LABEL ) diff --git a/mayan/apps/mailer/mailers.py b/mayan/apps/mailer/mailers.py index d2eb360b9c..5e958e1094 100644 --- a/mayan/apps/mailer/mailers.py +++ b/mayan/apps/mailer/mailers.py @@ -1,7 +1,5 @@ from __future__ import unicode_literals -from collections import OrderedDict - from django.utils.translation import ugettext_lazy as _ from .classes import MailerBackend diff --git a/mayan/apps/permissions/models.py b/mayan/apps/permissions/models.py index 77cfb07eab..5defea06b8 100644 --- a/mayan/apps/permissions/models.py +++ b/mayan/apps/permissions/models.py @@ -59,8 +59,8 @@ class StoredPermission(models.Model): if self in role.permissions.all(): logger.debug( 'Permission "%s" granted to user "%s" through role "%s"', - self, user, role - ) + self, user, role + ) return True logger.debug( diff --git a/mayan/apps/permissions/tests/test_models.py b/mayan/apps/permissions/tests/test_models.py index 33a6c4fadc..59587b0b46 100644 --- a/mayan/apps/permissions/tests/test_models.py +++ b/mayan/apps/permissions/tests/test_models.py @@ -1,27 +1,16 @@ from __future__ import unicode_literals -from django.contrib.auth import get_user_model -from django.contrib.auth.models import Group from django.core.exceptions import PermissionDenied from common.tests import BaseTestCase -from user_management.tests import TEST_GROUP_NAME, TEST_USER_USERNAME from ..classes import Permission -from ..models import Role from ..permissions import permission_role_view -from .literals import TEST_ROLE_LABEL - class PermissionTestCase(BaseTestCase): def setUp(self): super(PermissionTestCase, self).setUp() - self.user = get_user_model().objects.create( - username=TEST_USER_USERNAME - ) - self.group = Group.objects.create(name=TEST_GROUP_NAME) - self.role = Role.objects.create(label=TEST_ROLE_LABEL) def test_no_permissions(self): with self.assertRaises(PermissionDenied): diff --git a/mayan/apps/permissions/tests/test_views.py b/mayan/apps/permissions/tests/test_views.py index fa1b7bddae..f9b824fff7 100644 --- a/mayan/apps/permissions/tests/test_views.py +++ b/mayan/apps/permissions/tests/test_views.py @@ -1,13 +1,10 @@ from __future__ import unicode_literals -from django.contrib.auth import get_user_model from django.test.client import Client from django.urls import reverse from common.tests import BaseTestCase -from user_management.tests import ( - TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL -) +from user_management.tests import TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME from ..models import Role @@ -17,10 +14,6 @@ from .literals import TEST_ROLE_LABEL, TEST_ROLE_LABEL_EDITED class PermissionsViewsTestCase(BaseTestCase): def setUp(self): super(PermissionsViewsTestCase, self).setUp() - self.admin_user = get_user_model().objects.create_superuser( - username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL, - password=TEST_ADMIN_PASSWORD - ) self.client = Client() # Login the admin user logged_in = self.client.login( @@ -30,6 +23,8 @@ class PermissionsViewsTestCase(BaseTestCase): self.assertTrue(self.admin_user.is_authenticated) def test_role_creation_view(self): + self.role.delete() + response = self.client.post( reverse( 'permissions:role_create', @@ -44,11 +39,9 @@ class PermissionsViewsTestCase(BaseTestCase): self.assertEqual(Role.objects.first().label, TEST_ROLE_LABEL) def test_role_delete_view(self): - role = Role.objects.create(label=TEST_ROLE_LABEL) - response = self.client.post( reverse( - 'permissions:role_delete', args=(role.pk,), + 'permissions:role_delete', args=(self.role.pk,), ), follow=True ) @@ -57,11 +50,9 @@ class PermissionsViewsTestCase(BaseTestCase): self.assertEqual(Role.objects.count(), 0) def test_role_edit_view(self): - role = Role.objects.create(label=TEST_ROLE_LABEL) - response = self.client.post( reverse( - 'permissions:role_edit', args=(role.pk,), + 'permissions:role_edit', args=(self.role.pk,), ), data={ 'label': TEST_ROLE_LABEL_EDITED, }, follow=True diff --git a/mayan/apps/sources/tests/test_models.py b/mayan/apps/sources/tests/test_models.py index 40c163e504..e0ce513162 100644 --- a/mayan/apps/sources/tests/test_models.py +++ b/mayan/apps/sources/tests/test_models.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals import shutil -from django.contrib.auth import get_user_model from django.test import override_settings from common.utils import mkdtemp @@ -13,9 +12,6 @@ from documents.tests import ( TEST_NON_ASCII_DOCUMENT_FILENAME, TEST_NON_ASCII_DOCUMENT_PATH, TEST_NON_ASCII_COMPRESSED_DOCUMENT_PATH ) -from user_management.tests import ( - TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME -) from ..literals import SOURCE_UNCOMPRESS_CHOICE_Y from ..models import WatchFolderSource, WebFormSource @@ -33,14 +29,8 @@ class UploadDocumentTestCase(BaseTestCase): label=TEST_DOCUMENT_TYPE_LABEL ) - self.admin_user = get_user_model().objects.create_superuser( - username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL, - password=TEST_ADMIN_PASSWORD - ) - def tearDown(self): self.document_type.delete() - self.admin_user.delete() super(UploadDocumentTestCase, self).tearDown() def test_issue_gh_163(self): diff --git a/mayan/apps/tags/workflow_actions.py b/mayan/apps/tags/workflow_actions.py index 5834f86729..9d2cfb902f 100644 --- a/mayan/apps/tags/workflow_actions.py +++ b/mayan/apps/tags/workflow_actions.py @@ -15,7 +15,8 @@ logger = logging.getLogger(__name__) class AttachTagAction(WorkflowAction): fields = { - 'tags': {'label': _('Tags'), + 'tags': { + 'label': _('Tags'), 'class': 'django.forms.ModelMultipleChoiceField', 'kwargs': { 'help_text': _('Tags to attach to the document'), 'queryset': Tag.objects.none(), 'required': False @@ -31,13 +32,14 @@ class AttachTagAction(WorkflowAction): } } } + permission = permission_tag_attach def get_form_schema(self, request): user = request.user logger.debug('user: %s', user) queryset = AccessControlList.objects.filter_by_access( - permission_tag_attach, user, queryset=Tag.objects.all() + self.permission, user, queryset=Tag.objects.all() ) self.fields['tags']['kwargs']['queryset'] = queryset @@ -69,6 +71,7 @@ class RemoveTagAction(AttachTagAction): }, } label = _('Remove tag') + permission = permission_tag_remove def execute(self, context): for tag in self.get_tags():