PEP8 cleanups

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2017-08-31 03:21:56 -04:00
parent 27468651ff
commit 5225d8d068
11 changed files with 42 additions and 74 deletions

View File

@@ -4,9 +4,6 @@ from django.contrib.contenttypes.models import ContentType
from django.urls import reverse
from documents.tests.test_views import GenericDocumentViewTestCase
from user_management.tests.literals import (
TEST_USER_PASSWORD, TEST_USER_USERNAME
)
from ..links import (
link_acl_delete, link_acl_list, link_acl_create, link_acl_permissions
@@ -22,7 +19,7 @@ class ACLsLinksTestCase(GenericDocumentViewTestCase):
)
acl.permissions.add(permission_acl_edit.stored_permission)
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.add_test_view(test_object=self.document)
context = self.get_test_view()
@@ -47,7 +44,7 @@ class ACLsLinksTestCase(GenericDocumentViewTestCase):
)
acl.permissions.add(permission_acl_edit.stored_permission)
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.add_test_view(test_object=acl)
context = self.get_test_view()
@@ -65,7 +62,7 @@ class ACLsLinksTestCase(GenericDocumentViewTestCase):
)
acl.permissions.add(permission_acl_edit.stored_permission)
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.add_test_view(test_object=acl)
context = self.get_test_view()
@@ -83,7 +80,7 @@ class ACLsLinksTestCase(GenericDocumentViewTestCase):
)
acl.permissions.add(permission_acl_view.stored_permission)
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.add_test_view(test_object=self.document)
context = self.get_test_view()

View File

@@ -3,9 +3,6 @@ from __future__ import absolute_import, unicode_literals
from django.contrib.contenttypes.models import ContentType
from documents.tests.test_views import GenericDocumentViewTestCase
from user_management.tests import (
TEST_USER_USERNAME, TEST_USER_PASSWORD
)
from ..models import AccessControlList
from ..permissions import permission_acl_edit, permission_acl_view
@@ -24,7 +21,7 @@ class AccessControlListViewTestCase(GenericDocumentViewTestCase):
}
def test_acl_create_view_no_permission(self):
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
response = self.get(
viewname='acls:acl_create', kwargs=self.view_arguments, data={
@@ -36,7 +33,7 @@ class AccessControlListViewTestCase(GenericDocumentViewTestCase):
self.assertEqual(AccessControlList.objects.count(), 0)
def test_acl_create_view_with_permission(self):
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.role.permissions.add(
permission_acl_edit.stored_permission
@@ -53,7 +50,7 @@ class AccessControlListViewTestCase(GenericDocumentViewTestCase):
)
def test_acl_create_view_post_no_permission(self):
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
response = self.post(
viewname='acls:acl_create', kwargs=self.view_arguments, data={
@@ -65,7 +62,7 @@ class AccessControlListViewTestCase(GenericDocumentViewTestCase):
self.assertEqual(AccessControlList.objects.count(), 0)
def test_acl_create_view_with_post_permission(self):
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.role.permissions.add(
permission_acl_edit.stored_permission
@@ -90,7 +87,7 @@ class AccessControlListViewTestCase(GenericDocumentViewTestCase):
content_object=self.document, role=self.role
)
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.role.permissions.add(
permission_acl_edit.stored_permission
@@ -114,7 +111,7 @@ class AccessControlListViewTestCase(GenericDocumentViewTestCase):
Result: Should display a blank permissions list (not optgroup)
"""
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.role.permissions.add(
permission_acl_edit.stored_permission
@@ -140,7 +137,7 @@ class AccessControlListViewTestCase(GenericDocumentViewTestCase):
self.assertEqual(AccessControlList.objects.count(), 1)
def test_acl_list_view_no_permission(self):
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
document = self.document.add_as_recent_document_for_user(
self.user
@@ -167,7 +164,7 @@ class AccessControlListViewTestCase(GenericDocumentViewTestCase):
self.assertNotContains(response, text='otal: 1', status_code=403)
def test_acl_list_view_with_permission(self):
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.role.permissions.add(
permission_acl_view.stored_permission

View File

@@ -3,9 +3,6 @@ from __future__ import absolute_import, unicode_literals
from django_downloadview.test import assert_download_response
from common.tests.test_views import GenericViewTestCase
from user_management.tests import (
TEST_USER_USERNAME, TEST_USER_PASSWORD
)
from ..models import Key
from ..permissions import permission_key_download, permission_key_upload
@@ -17,7 +14,7 @@ class KeyViewTestCase(GenericViewTestCase):
def test_key_download_view_no_permission(self):
key = Key.objects.create(key_data=TEST_KEY_DATA)
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
response = self.get(
viewname='django_gpg:key_download', args=(key.pk,)
@@ -28,7 +25,7 @@ class KeyViewTestCase(GenericViewTestCase):
def test_key_download_view_with_permission(self):
key = Key.objects.create(key_data=TEST_KEY_DATA)
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.role.permissions.add(permission_key_download.stored_permission)
@@ -44,7 +41,7 @@ class KeyViewTestCase(GenericViewTestCase):
)
def test_key_upload_view_no_permission(self):
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
response = self.post(
viewname='django_gpg:key_upload', data={'key_data': TEST_KEY_DATA}
@@ -54,7 +51,7 @@ class KeyViewTestCase(GenericViewTestCase):
self.assertEqual(Key.objects.count(), 0)
def test_key_upload_view_with_permission(self):
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.role.permissions.add(permission_key_upload.stored_permission)

View File

@@ -1,9 +1,6 @@
from __future__ import absolute_import, unicode_literals
from documents.tests.test_views import GenericDocumentViewTestCase
from user_management.tests import (
TEST_USER_USERNAME, TEST_USER_PASSWORD
)
from ..models import Index
from ..permissions import (
@@ -19,7 +16,7 @@ from .literals import (
class IndexViewTestCase(GenericDocumentViewTestCase):
def test_index_create_view_no_permission(self):
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
response = self.post(
'indexing:index_setup_create', data={
@@ -31,7 +28,7 @@ class IndexViewTestCase(GenericDocumentViewTestCase):
self.assertEqual(Index.objects.count(), 0)
def test_index_create_view_with_permission(self):
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.role.permissions.add(
permission_document_indexing_create.stored_permission
@@ -48,7 +45,7 @@ class IndexViewTestCase(GenericDocumentViewTestCase):
self.assertEqual(Index.objects.first().label, TEST_INDEX_LABEL)
def test_index_delete_view_no_permission(self):
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
index = Index.objects.create(
label=TEST_INDEX_LABEL, slug=TEST_INDEX_SLUG
@@ -59,7 +56,7 @@ class IndexViewTestCase(GenericDocumentViewTestCase):
self.assertEqual(Index.objects.count(), 1)
def test_index_delete_view_with_permission(self):
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.role.permissions.add(
permission_document_indexing_delete.stored_permission
@@ -77,7 +74,7 @@ class IndexViewTestCase(GenericDocumentViewTestCase):
self.assertEqual(Index.objects.count(), 0)
def test_index_edit_view_no_permission(self):
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
index = Index.objects.create(
label=TEST_INDEX_LABEL, slug=TEST_INDEX_SLUG
@@ -93,7 +90,7 @@ class IndexViewTestCase(GenericDocumentViewTestCase):
self.assertEqual(index.label, TEST_INDEX_LABEL)
def test_index_edit_view_with_permission(self):
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.role.permissions.add(
permission_document_indexing_edit.stored_permission
@@ -135,7 +132,7 @@ class IndexViewTestCase(GenericDocumentViewTestCase):
def test_index_instance_node_view_no_permission(self):
index = self.create_test_index()
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
response = self.get(
'indexing:index_instance_node_view', args=(index.instance_root.pk,)
@@ -146,7 +143,7 @@ class IndexViewTestCase(GenericDocumentViewTestCase):
def test_index_instance_node_view_with_permission(self):
index = self.create_test_index()
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.role.permissions.add(
permission_document_indexing_view.stored_permission

View File

@@ -5,9 +5,6 @@ from django.urls import reverse
from documents.tests.literals import TEST_DOCUMENT_PATH
from documents.tests.test_views import GenericDocumentViewTestCase
from user_management.tests.literals import (
TEST_USER_PASSWORD, TEST_USER_USERNAME
)
from ..links import (
link_document_version_signature_delete,
@@ -28,7 +25,7 @@ class DocumentSignatureLinksTestCase(GenericDocumentViewTestCase):
file_object=file_object
)
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.add_test_view(
test_object=document.latest_version.signatures.first()
@@ -46,7 +43,7 @@ class DocumentSignatureLinksTestCase(GenericDocumentViewTestCase):
file_object=file_object
)
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.role.permissions.add(
permission_document_version_signature_view.stored_permission
@@ -81,7 +78,7 @@ class DocumentSignatureLinksTestCase(GenericDocumentViewTestCase):
signature_file=File(file_object)
)
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.add_test_view(
test_object=document.latest_version.signatures.first()
@@ -105,7 +102,7 @@ class DocumentSignatureLinksTestCase(GenericDocumentViewTestCase):
signature_file=File(file_object)
)
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.role.permissions.add(
permission_document_version_signature_delete.stored_permission

View File

@@ -7,9 +7,6 @@ import time
from django.urls import reverse
from acls.models import AccessControlList
from user_management.tests.literals import (
TEST_USER_PASSWORD, TEST_USER_USERNAME
)
from ..links import (
link_document_restore, link_document_version_download,
@@ -31,7 +28,7 @@ class DocumentsLinksTestCase(GenericDocumentViewTestCase):
self.assertTrue(self.document.versions.count(), 2)
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.add_test_view(test_object=self.document.versions.first())
context = self.get_test_view()
@@ -49,7 +46,7 @@ class DocumentsLinksTestCase(GenericDocumentViewTestCase):
self.assertTrue(self.document.versions.count(), 2)
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
acl = AccessControlList.objects.create(
content_object=self.document, role=self.role
@@ -72,7 +69,7 @@ class DocumentsLinksTestCase(GenericDocumentViewTestCase):
)
def test_document_version_download_link_no_permission(self):
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.add_test_view(test_object=self.document.latest_version)
context = self.get_test_view()
@@ -81,7 +78,7 @@ class DocumentsLinksTestCase(GenericDocumentViewTestCase):
self.assertEqual(resolved_link, None)
def test_document_version_download_link_with_permission(self):
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
acl = AccessControlList.objects.create(
content_object=self.document, role=self.role
@@ -106,7 +103,7 @@ class DeletedDocumentsLinksTestCase(GenericDocumentViewTestCase):
def test_deleted_document_restore_link_no_permission(self):
self.document.delete()
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.add_test_view(test_object=self.document)
context = self.get_test_view()
@@ -117,7 +114,7 @@ class DeletedDocumentsLinksTestCase(GenericDocumentViewTestCase):
def test_deleted_document_restore_link_with_permission(self):
self.document.delete()
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
acl = AccessControlList.objects.create(
content_object=self.document, role=self.role

View File

@@ -7,11 +7,9 @@ from django.contrib import messages
from django.shortcuts import get_object_or_404, resolve_url
from django.urls import reverse
from django.utils.http import urlencode
from django.utils.six.moves.urllib.parse import parse_qs, urlparse
from django.utils.translation import ugettext_lazy as _
from django.views.generic import RedirectView
from django.utils.six.moves.urllib.parse import (
parse_qs, unquote_plus, urlparse
)
from acls.models import AccessControlList
from common.generics import SimpleView, SingleObjectListView

View File

@@ -3,9 +3,6 @@ from __future__ import absolute_import, unicode_literals
from django.contrib.contenttypes.models import ContentType
from documents.tests.test_views import GenericDocumentViewTestCase
from user_management.tests import (
TEST_USER_USERNAME, TEST_USER_PASSWORD
)
from ..permissions import permission_events_view
@@ -23,7 +20,7 @@ class EventsViewTestCase(GenericDocumentViewTestCase):
}
def test_events_for_object_view_no_permission(self):
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
document = self.document.add_as_recent_document_for_user(
self.user
@@ -45,7 +42,7 @@ class EventsViewTestCase(GenericDocumentViewTestCase):
self.assertNotContains(response, text='otal:', status_code=403)
def test_events_for_object_view_with_permission(self):
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)
self.login_user()
self.role.permissions.add(
permission_events_view.stored_permission

View File

@@ -1,15 +1,8 @@
from __future__ import unicode_literals
from common.tests import BaseTestCase
from ..models import MetadataType
from ..models import MetadataType, DocumentMetadata
from .literals import (
TEST_DEFAULT_VALUE, TEST_LOOKUP_TEMPLATE, TEST_INCORRECT_LOOKUP_VALUE,
TEST_CORRECT_LOOKUP_VALUE, TEST_DATE_VALIDATOR, TEST_DATE_PARSER,
TEST_METADATA_TYPE_NAME, TEST_METADATA_TYPE_LABEL, TEST_INVALID_DATE,
TEST_VALID_DATE, TEST_PARSED_VALID_DATE
)
from .literals import TEST_METADATA_TYPE_NAME, TEST_METADATA_TYPE_LABEL
class MetadataTypeMixin(object):

View File

@@ -11,13 +11,12 @@ from documents.tests import (
TEST_DOCUMENT_TYPE_LABEL
)
from ..models import MetadataType, DocumentMetadata
from ..models import DocumentMetadata
from .literals import (
TEST_DEFAULT_VALUE, TEST_LOOKUP_TEMPLATE, TEST_INCORRECT_LOOKUP_VALUE,
TEST_CORRECT_LOOKUP_VALUE, TEST_DATE_VALIDATOR, TEST_DATE_PARSER,
TEST_METADATA_TYPE_NAME, TEST_METADATA_TYPE_LABEL, TEST_INVALID_DATE,
TEST_VALID_DATE, TEST_PARSED_VALID_DATE
TEST_INVALID_DATE, TEST_VALID_DATE, TEST_PARSED_VALID_DATE
)
from .mixins import MetadataTypeMixin

View File

@@ -18,7 +18,6 @@ from documents.tests import (
TEST_SMALL_DOCUMENT_CHECKSUM, TEST_SMALL_DOCUMENT_PATH
)
from documents.tests.test_views import GenericDocumentViewTestCase
from metadata.models import MetadataType
from metadata.tests.literals import TEST_METADATA_VALUE_UNICODE
from metadata.tests.mixins import MetadataTypeMixin
@@ -149,7 +148,7 @@ class DocumentUploadMetadataTestCase(MetadataTypeMixin, GenericDocumentViewTestC
# Upload the test document
with open(TEST_SMALL_DOCUMENT_PATH) as file_descriptor:
response = self.post(
self.post(
path=url, data={
'document-language': 'eng', 'source-file': file_descriptor,
'document_type_id': self.document_type.pk,