PEP8 Cleanups.
This commit is contained in:
@@ -4,12 +4,11 @@ from datetime import timedelta
|
||||
|
||||
from kombu import Exchange, Queue
|
||||
|
||||
from django.db.models.signals import pre_save
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from acls import ModelPermission
|
||||
from common import MayanAppConfig, menu_facet, menu_main, menu_sidebar
|
||||
from documents.models import Document, DocumentVersion
|
||||
from documents.models import Document
|
||||
from mayan.celery import app
|
||||
from rest_api.classes import APIEndPoint
|
||||
|
||||
|
||||
@@ -2,15 +2,9 @@ from __future__ import unicode_literals
|
||||
|
||||
import datetime
|
||||
|
||||
from django.contrib.auth.models import User
|
||||
from django.core.files import File
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.test.client import Client
|
||||
from django.test import TestCase
|
||||
from django.utils.timezone import now
|
||||
|
||||
from common.literals import TIME_DELTA_UNIT_DAYS
|
||||
from documents.models import DocumentType
|
||||
from documents.tests.literals import (
|
||||
TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH
|
||||
)
|
||||
@@ -159,7 +153,7 @@ class DocumentCheckoutViewTestCase(GenericDocumentViewTestCase):
|
||||
follow=True
|
||||
)
|
||||
|
||||
#Needed by the url view resolver
|
||||
# Needed by the url view resolver
|
||||
response.context.current_app = None
|
||||
resolved_link = link_upload_version.resolve(context=response.context)
|
||||
|
||||
|
||||
@@ -5,7 +5,6 @@ from django.contrib import messages
|
||||
from django.core.exceptions import PermissionDenied
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.http import HttpResponseRedirect
|
||||
from django.shortcuts import get_object_or_404
|
||||
from django.utils.translation import ungettext
|
||||
|
||||
from acls.models import AccessControlList
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
from __future__ import absolute_import, unicode_literals
|
||||
|
||||
from django.conf.urls import include, url
|
||||
from django.conf.urls import url
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.contrib.auth.models import Group
|
||||
from django.core.urlresolvers import clear_url_caches, reverse
|
||||
from django.http import HttpResponse
|
||||
from django.template import Context, Template
|
||||
from django.test import TestCase
|
||||
from django.test.client import Client
|
||||
|
||||
from permissions import Permission
|
||||
from permissions.models import Role
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.utils.translation import ugettext
|
||||
|
||||
|
||||
class DocumentException(Exception):
|
||||
"""
|
||||
|
||||
@@ -116,7 +116,7 @@ link_document_multiple_download = Link(
|
||||
)
|
||||
link_document_multiple_update_page_count = Link(
|
||||
text=_('Recalculate page count'),
|
||||
view='documents:document_multiple_update_page_count'
|
||||
view='documents:document_multiple_update_page_count'
|
||||
)
|
||||
link_document_multiple_restore = Link(
|
||||
text=_('Restore'), view='documents:document_multiple_restore'
|
||||
|
||||
@@ -782,7 +782,6 @@ class DocumentPage(models.Model):
|
||||
return '{}-{}'.format(self.document_version.uuid, self.pk)
|
||||
|
||||
|
||||
|
||||
class NewVersionBlock(models.Model):
|
||||
document = models.ForeignKey(Document, verbose_name=_('Document'))
|
||||
|
||||
|
||||
@@ -31,7 +31,6 @@ from converter.permissions import permission_transformation_delete
|
||||
from filetransfers.api import serve_file
|
||||
from permissions import Permission
|
||||
|
||||
from .events import event_document_type_change
|
||||
from .forms import (
|
||||
DocumentDownloadForm, DocumentForm, DocumentPageForm, DocumentPreviewForm,
|
||||
DocumentPropertiesForm, DocumentTypeSelectForm,
|
||||
|
||||
@@ -15,6 +15,7 @@ from user_management.tests import (
|
||||
TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME
|
||||
)
|
||||
|
||||
|
||||
@override_settings(OCR_AUTO_OCR=False)
|
||||
class SearchAPITestCase(APITestCase):
|
||||
"""
|
||||
|
||||
@@ -11,6 +11,7 @@ from user_management.tests import (
|
||||
TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL
|
||||
)
|
||||
|
||||
|
||||
class DocumentSearchTestCase(TestCase):
|
||||
def setUp(self):
|
||||
self.admin_user = User.objects.create_superuser(
|
||||
|
||||
@@ -3,4 +3,3 @@ from __future__ import unicode_literals
|
||||
from .classes import PropertyNamespace # NOQA
|
||||
|
||||
default_app_config = 'installation.apps.InstallationApp'
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
default_app_config = 'linking.apps.LinkingApp'
|
||||
|
||||
|
||||
@@ -1,11 +1,5 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.contrib.auth.models import User
|
||||
from django.core.files import File
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.test.client import Client
|
||||
from django.test import TestCase
|
||||
|
||||
from documents.models import DocumentType
|
||||
from documents.permissions import (
|
||||
permission_document_properties_edit, permission_document_view
|
||||
|
||||
@@ -1,14 +1,7 @@
|
||||
from __future__ import absolute_import, unicode_literals
|
||||
|
||||
from django.conf.urls import include, url
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.contrib.auth.models import Group
|
||||
from django.contrib.contenttypes.models import ContentType
|
||||
from django.core.files.base import File
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.http import HttpResponse
|
||||
from django.template import Context, Template
|
||||
|
||||
from django.template import Context
|
||||
|
||||
from acls.models import AccessControlList
|
||||
from common.tests.literals import TEST_VIEW_NAME
|
||||
|
||||
@@ -1,20 +1,19 @@
|
||||
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
|
||||
from django.http import HttpResponseRedirect
|
||||
from django.shortcuts import get_object_or_404, render_to_response
|
||||
from django.template import RequestContext
|
||||
from django.utils.translation import ugettext_lazy as _, ungettext
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from acls.models import AccessControlList
|
||||
from common.generics import (
|
||||
ConfirmView, FormView, SingleObjectEditView, SingleObjectListView
|
||||
)
|
||||
from common.mixins import MultipleInstanceActionMixin
|
||||
from documents.models import Document, DocumentType, DocumentVersion
|
||||
from documents.models import Document, DocumentType
|
||||
from permissions import Permission
|
||||
|
||||
from .forms import DocumentContentForm, DocumentTypeSelectForm
|
||||
|
||||
@@ -3,4 +3,3 @@ from __future__ import unicode_literals
|
||||
from .classes import Permission, PermissionNamespace # NOQA
|
||||
|
||||
default_app_config = 'permissions.apps.PermissionsApp'
|
||||
|
||||
|
||||
@@ -3,4 +3,3 @@ from __future__ import unicode_literals
|
||||
from .classes import Namespace, Setting # NOQA
|
||||
|
||||
default_app_config = 'smart_settings.apps.SmartSettingsApp'
|
||||
|
||||
|
||||
@@ -166,7 +166,7 @@ class NewDocumentVersionViewTestCase(GenericDocumentViewTestCase):
|
||||
follow=True
|
||||
)
|
||||
|
||||
#Needed by the url view resolver
|
||||
# Needed by the url view resolver
|
||||
response.context.current_app = None
|
||||
resolved_link = link_upload_version.resolve(context=response.context)
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ from navigation import Link
|
||||
|
||||
from .permissions import permission_statistics_view
|
||||
|
||||
#Translators: 'Queue' here is the verb, to queue a statistic to update
|
||||
# Translators: 'Queue' here is the verb, to queue a statistic to update
|
||||
link_execute = Link(
|
||||
permissions=(permission_statistics_view,), text=_('Queue'),
|
||||
view='statistics:statistic_queue', args='resolved_object.slug'
|
||||
|
||||
@@ -6,7 +6,7 @@ from django.contrib import messages
|
||||
from django.core.exceptions import PermissionDenied
|
||||
from django.core.urlresolvers import reverse, reverse_lazy
|
||||
from django.conf import settings
|
||||
from django.http import Http404, HttpResponseRedirect
|
||||
from django.http import HttpResponseRedirect
|
||||
from django.shortcuts import get_object_or_404, render_to_response
|
||||
from django.template import RequestContext
|
||||
from django.utils.translation import ugettext_lazy as _, ungettext
|
||||
|
||||
@@ -3,7 +3,6 @@ from __future__ import unicode_literals
|
||||
from django.contrib.auth import get_user_model
|
||||
|
||||
from common.tests.test_views import GenericViewTestCase
|
||||
from documents.permissions import permission_document_view
|
||||
|
||||
from ..permissions import (
|
||||
permission_user_delete, permission_user_edit, permission_user_view
|
||||
@@ -30,10 +29,9 @@ class UserManagementViewTestCase(GenericViewTestCase):
|
||||
)
|
||||
|
||||
self.assertEqual(response.status_code, 403)
|
||||
user = get_user_model().objects.get(username=TEST_USER_USERNAME)
|
||||
|
||||
self.client.logout()
|
||||
logged_in = self.client.login(
|
||||
self.client.login(
|
||||
username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD_EDITED
|
||||
)
|
||||
|
||||
@@ -57,7 +55,7 @@ class UserManagementViewTestCase(GenericViewTestCase):
|
||||
self.assertContains(response, text='Successfull', status_code=200)
|
||||
|
||||
self.client.logout()
|
||||
logged_in = self.client.login(
|
||||
self.client.login(
|
||||
username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD_EDITED
|
||||
)
|
||||
response = self.get('common:current_user_details')
|
||||
@@ -78,10 +76,9 @@ class UserManagementViewTestCase(GenericViewTestCase):
|
||||
)
|
||||
|
||||
self.assertEqual(response.status_code, 403)
|
||||
user = get_user_model().objects.get(username=TEST_USER_USERNAME)
|
||||
|
||||
self.client.logout()
|
||||
logged_in = self.client.login(
|
||||
self.client.login(
|
||||
username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD_EDITED
|
||||
)
|
||||
|
||||
@@ -106,7 +103,7 @@ class UserManagementViewTestCase(GenericViewTestCase):
|
||||
self.assertContains(response, text='Successfull', status_code=200)
|
||||
|
||||
self.client.logout()
|
||||
logged_in = self.client.login(
|
||||
self.client.login(
|
||||
username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD_EDITED
|
||||
)
|
||||
response = self.get('common:current_user_details')
|
||||
|
||||
Reference in New Issue
Block a user