Fix PEP8 warnings.
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
@@ -29,7 +29,7 @@ from .links import (
|
|||||||
|
|
||||||
from .literals import DELETE_STALE_UPLOADS_INTERVAL
|
from .literals import DELETE_STALE_UPLOADS_INTERVAL
|
||||||
from .menus import (
|
from .menus import (
|
||||||
menu_about, menu_main, menu_secondary, menu_tools, menu_user
|
menu_about, menu_main, menu_secondary, menu_user
|
||||||
)
|
)
|
||||||
from .licenses import * # NOQA
|
from .licenses import * # NOQA
|
||||||
from .queues import * # NOQA - Force queues registration
|
from .queues import * # NOQA - Force queues registration
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import zipfile
|
|||||||
try:
|
try:
|
||||||
import zlib # NOQA
|
import zlib # NOQA
|
||||||
COMPRESSION = zipfile.ZIP_DEFLATED
|
COMPRESSION = zipfile.ZIP_DEFLATED
|
||||||
except:
|
except ImportError:
|
||||||
COMPRESSION = zipfile.ZIP_STORED
|
COMPRESSION = zipfile.ZIP_STORED
|
||||||
|
|
||||||
from django.core.files.uploadedfile import SimpleUploadedFile
|
from django.core.files.uploadedfile import SimpleUploadedFile
|
||||||
|
|||||||
@@ -127,7 +127,7 @@ class AssignRemoveView(ExtraContextMixin, ViewPermissionCheckMixin, ObjectPermis
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
action_function(selection_obj)
|
action_function(selection_obj)
|
||||||
except:
|
except Exception:
|
||||||
if settings.DEBUG:
|
if settings.DEBUG:
|
||||||
raise
|
raise
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import hashlib
|
|||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
import shutil
|
import shutil
|
||||||
import sys
|
|
||||||
import tarfile
|
import tarfile
|
||||||
|
|
||||||
from furl import furl
|
from furl import furl
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ from json import dumps
|
|||||||
|
|
||||||
import sh
|
import sh
|
||||||
|
|
||||||
from django.conf import settings
|
|
||||||
from django.template import Context, Library
|
from django.template import Context, Library
|
||||||
from django.template.loader import get_template
|
from django.template.loader import get_template
|
||||||
from django.utils.encoding import force_text
|
from django.utils.encoding import force_text
|
||||||
|
|||||||
@@ -5,13 +5,13 @@ from json import dumps
|
|||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib import messages
|
from django.contrib import messages
|
||||||
from django.contrib.contenttypes.models import ContentType
|
from django.contrib.contenttypes.models import ContentType
|
||||||
from django.http import Http404, HttpResponseRedirect
|
from django.http import HttpResponseRedirect
|
||||||
from django.shortcuts import get_object_or_404, resolve_url
|
from django.shortcuts import get_object_or_404, resolve_url
|
||||||
from django.template import RequestContext
|
from django.template import RequestContext
|
||||||
from django.urls import reverse, reverse_lazy
|
from django.urls import reverse_lazy
|
||||||
from django.utils import timezone, translation
|
from django.utils import timezone, translation
|
||||||
from django.utils.http import urlencode
|
from django.utils.http import urlencode
|
||||||
from django.utils.translation import ugettext_lazy as _, ugettext
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.views.generic import RedirectView, TemplateView
|
from django.views.generic import RedirectView, TemplateView
|
||||||
|
|
||||||
from acls.models import AccessControlList
|
from acls.models import AccessControlList
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
RETRY_DELAY = 10
|
RETRY_DELAY = 10
|
||||||
|
|
||||||
|
|||||||
@@ -6,8 +6,6 @@ from django.apps import apps
|
|||||||
|
|
||||||
from mayan.celery import app
|
from mayan.celery import app
|
||||||
|
|
||||||
from .literals import RETRY_DELAY
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -649,7 +649,7 @@ class DocumentVersion(models.Model):
|
|||||||
self.mimetype, self.encoding = get_mimetype(
|
self.mimetype, self.encoding = get_mimetype(
|
||||||
file_object=file_object
|
file_object=file_object
|
||||||
)
|
)
|
||||||
except:
|
except Exception:
|
||||||
self.mimetype = ''
|
self.mimetype = ''
|
||||||
self.encoding = ''
|
self.encoding = ''
|
||||||
finally:
|
finally:
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
|
|||||||
from ..literals import (
|
from ..literals import (
|
||||||
DEFAULT_DELETE_PERIOD, DEFAULT_DELETE_TIME_UNIT
|
DEFAULT_DELETE_PERIOD, DEFAULT_DELETE_TIME_UNIT
|
||||||
)
|
)
|
||||||
from ..models import Document, DocumentType
|
from ..models import DocumentType
|
||||||
from ..permissions import (
|
from ..permissions import (
|
||||||
permission_document_type_create, permission_document_type_delete,
|
permission_document_type_create, permission_document_type_delete,
|
||||||
permission_document_type_edit, permission_document_type_view,
|
permission_document_type_edit, permission_document_type_view,
|
||||||
@@ -213,6 +213,6 @@ class DocumentTypeQuickLabelViewsTestCase(GenericDocumentViewTestCase):
|
|||||||
obj=self.document_type, permission=permission_document_type_view
|
obj=self.document_type, permission=permission_document_type_view
|
||||||
)
|
)
|
||||||
response = self._request_quick_label_list_view()
|
response = self._request_quick_label_list_view()
|
||||||
self.assertContains(response, text=self.document_type_filename,
|
self.assertContains(
|
||||||
status_code=200
|
response, text=self.document_type_filename, status_code=200
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,10 +1,8 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
from datetime import timedelta
|
from datetime import timedelta
|
||||||
import os
|
|
||||||
import time
|
import time
|
||||||
|
|
||||||
from django.conf import settings
|
|
||||||
from django.test import override_settings
|
from django.test import override_settings
|
||||||
|
|
||||||
from common.tests import BaseTestCase
|
from common.tests import BaseTestCase
|
||||||
@@ -18,7 +16,7 @@ from .base import GenericDocumentTestCase
|
|||||||
from .literals import (
|
from .literals import (
|
||||||
TEST_DOCUMENT_TYPE_LABEL, TEST_DOCUMENT_PATH, TEST_MULTI_PAGE_TIFF_PATH,
|
TEST_DOCUMENT_TYPE_LABEL, TEST_DOCUMENT_PATH, TEST_MULTI_PAGE_TIFF_PATH,
|
||||||
TEST_PDF_INDIRECT_ROTATE_PATH, TEST_OFFICE_DOCUMENT_PATH,
|
TEST_PDF_INDIRECT_ROTATE_PATH, TEST_OFFICE_DOCUMENT_PATH,
|
||||||
TEST_SMALL_DOCUMENT_FILENAME, TEST_SMALL_DOCUMENT_PATH
|
TEST_SMALL_DOCUMENT_PATH
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ from __future__ import unicode_literals
|
|||||||
import json
|
import json
|
||||||
|
|
||||||
from django import forms
|
from django import forms
|
||||||
from django.conf import settings
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from acls.models import AccessControlList
|
from acls.models import AccessControlList
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ def metadata_repr_as_list(metadata_list):
|
|||||||
try:
|
try:
|
||||||
output.append('%s - %s' % (MetadataType.objects.get(
|
output.append('%s - %s' % (MetadataType.objects.get(
|
||||||
pk=metadata_dict['id']), metadata_dict.get('value', '')))
|
pk=metadata_dict['id']), metadata_dict.get('value', '')))
|
||||||
except:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
return output
|
return output
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ from common.classes import ModelAttribute
|
|||||||
from common.widgets import two_state_template
|
from common.widgets import two_state_template
|
||||||
from documents.search import document_page_search, document_search
|
from documents.search import document_page_search, document_search
|
||||||
from documents.signals import post_document_type_change
|
from documents.signals import post_document_type_change
|
||||||
from documents.permissions import permission_document_view
|
|
||||||
from mayan.celery import app
|
from mayan.celery import app
|
||||||
from navigation import SourceColumn
|
from navigation import SourceColumn
|
||||||
|
|
||||||
|
|||||||
@@ -120,14 +120,12 @@ class PermissionsViewsTestCase(GenericViewTestCase):
|
|||||||
def test_role_permissions_view_with_permission_grant(self):
|
def test_role_permissions_view_with_permission_grant(self):
|
||||||
self._create_role()
|
self._create_role()
|
||||||
self.grant_access(permission=permission_permission_grant, obj=self.role_2)
|
self.grant_access(permission=permission_permission_grant, obj=self.role_2)
|
||||||
#self.grant_access(permission=permission_role_edit, obj=self.role_2)
|
|
||||||
response = self._request_role_permissions_view()
|
response = self._request_role_permissions_view()
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, 200)
|
||||||
|
|
||||||
def test_role_permissions_view_with_permission_revoke(self):
|
def test_role_permissions_view_with_permission_revoke(self):
|
||||||
self._create_role()
|
self._create_role()
|
||||||
self.grant_access(permission=permission_permission_revoke, obj=self.role_2)
|
self.grant_access(permission=permission_permission_revoke, obj=self.role_2)
|
||||||
#self.grant_access(permission=permission_role_edit, obj=self.role_2)
|
|
||||||
response = self._request_role_permissions_view()
|
response = self._request_role_permissions_view()
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, 200)
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,5 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
from django.contrib.contenttypes.models import ContentType
|
|
||||||
from django.urls import reverse
|
|
||||||
|
|
||||||
from acls.models import AccessControlList
|
|
||||||
from documents.tests import GenericDocumentViewTestCase
|
from documents.tests import GenericDocumentViewTestCase
|
||||||
from documents.permissions import permission_document_create
|
from documents.permissions import permission_document_create
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import zipfile
|
|||||||
try:
|
try:
|
||||||
import zlib # NOQA
|
import zlib # NOQA
|
||||||
COMPRESSION = zipfile.ZIP_DEFLATED
|
COMPRESSION = zipfile.ZIP_DEFLATED
|
||||||
except:
|
except ImportError:
|
||||||
COMPRESSION = zipfile.ZIP_STORED
|
COMPRESSION = zipfile.ZIP_STORED
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -3,8 +3,6 @@ from __future__ import absolute_import, unicode_literals
|
|||||||
from django import forms
|
from django import forms
|
||||||
from django.apps import apps
|
from django.apps import apps
|
||||||
from django.template.loader import render_to_string
|
from django.template.loader import render_to_string
|
||||||
from django.utils.encoding import force_text
|
|
||||||
from django.utils.html import format_html
|
|
||||||
from django.utils.safestring import mark_safe
|
from django.utils.safestring import mark_safe
|
||||||
|
|
||||||
from .permissions import permission_tag_view
|
from .permissions import permission_tag_view
|
||||||
|
|||||||
@@ -14,13 +14,11 @@ from metadata.tests.literals import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
from ..permissions import (
|
from ..permissions import (
|
||||||
permission_user_create, permission_user_delete, permission_user_edit,
|
permission_user_create, permission_user_delete, permission_user_edit
|
||||||
permission_user_view
|
|
||||||
)
|
)
|
||||||
|
|
||||||
from .literals import (
|
from .literals import (
|
||||||
TEST_USER_PASSWORD_EDITED, TEST_USER_USERNAME, TEST_USER_2_USERNAME,
|
TEST_USER_PASSWORD_EDITED, TEST_USER_USERNAME, TEST_USER_2_USERNAME
|
||||||
TEST_USER_2_USERNAME_EDITED
|
|
||||||
)
|
)
|
||||||
|
|
||||||
TEST_USER_TO_DELETE_USERNAME = 'user_to_delete'
|
TEST_USER_TO_DELETE_USERNAME = 'user_to_delete'
|
||||||
|
|||||||
Reference in New Issue
Block a user