From 8c63ef4c69237b91e9d8a54d17cff3972b6aa527 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 14 Dec 2018 21:46:07 -0400 Subject: [PATCH] Styling: PermissionNamespace keyword arguments Add keyword arguments to all called instances of PermissionNamespace. Sort name and label arguments. Signed-off-by: Roberto Rosario --- mayan/apps/acls/permissions.py | 2 +- mayan/apps/acls/views.py | 2 +- mayan/apps/cabinets/permissions.py | 2 +- mayan/apps/checkouts/permissions.py | 2 +- mayan/apps/common/permissions_runtime.py | 2 +- mayan/apps/converter/permissions.py | 2 +- mayan/apps/django_gpg/permissions.py | 2 +- mayan/apps/document_comments/permissions.py | 2 +- mayan/apps/document_indexing/permissions.py | 2 +- mayan/apps/document_parsing/permissions.py | 2 +- mayan/apps/document_signatures/permissions.py | 2 +- mayan/apps/document_states/permissions.py | 2 +- mayan/apps/documents/permissions.py | 4 ++-- mayan/apps/events/permissions.py | 2 +- mayan/apps/file_metadata/permissions.py | 2 +- mayan/apps/linking/permissions.py | 2 +- mayan/apps/mailer/permissions.py | 2 +- mayan/apps/mayan_statistics/permissions.py | 2 +- mayan/apps/metadata/permissions.py | 6 ++++-- mayan/apps/motd/permissions.py | 2 +- mayan/apps/navigation/tests/test_classes.py | 4 ++-- mayan/apps/ocr/permissions.py | 2 +- mayan/apps/permissions/classes.py | 10 +++++----- mayan/apps/permissions/permissions.py | 2 +- mayan/apps/permissions/views.py | 2 +- mayan/apps/smart_settings/permissions.py | 2 +- mayan/apps/sources/permissions.py | 3 ++- mayan/apps/tags/permissions.py | 2 +- mayan/apps/task_manager/permissions.py | 2 +- mayan/apps/user_management/permissions.py | 2 +- 30 files changed, 40 insertions(+), 37 deletions(-) diff --git a/mayan/apps/acls/permissions.py b/mayan/apps/acls/permissions.py index b2e7e789a1..0d4bda0a49 100644 --- a/mayan/apps/acls/permissions.py +++ b/mayan/apps/acls/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('acls', _('Access control lists')) +namespace = PermissionNamespace(label=_('Access control lists'), name='acls') permission_acl_edit = namespace.add_permission( name='acl_edit', label=_('Edit ACLs') diff --git a/mayan/apps/acls/views.py b/mayan/apps/acls/views.py index b8ccc253ab..e24b77a2dc 100644 --- a/mayan/apps/acls/views.py +++ b/mayan/apps/acls/views.py @@ -183,7 +183,7 @@ class ACLPermissionsView(AssignRemoveView): (force_text(permission.pk), permission) for permission in permissions ] results.append( - (PermissionNamespace.get(namespace), permission_options) + (PermissionNamespace.get(name=namespace), permission_options) ) return results diff --git a/mayan/apps/cabinets/permissions.py b/mayan/apps/cabinets/permissions.py index e6730ce111..6d3031dbde 100644 --- a/mayan/apps/cabinets/permissions.py +++ b/mayan/apps/cabinets/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('cabinets', _('Cabinets')) +namespace = PermissionNamespace(label=_('Cabinets'), name='cabinets') # Translators: this refers to the permission that will allow users to add # documents to cabinets. diff --git a/mayan/apps/checkouts/permissions.py b/mayan/apps/checkouts/permissions.py index fa0f0468ed..6122f54e9c 100644 --- a/mayan/apps/checkouts/permissions.py +++ b/mayan/apps/checkouts/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('checkouts', _('Document checkout')) +namespace = PermissionNamespace(label=_('Document checkout'), name='checkouts') permission_document_checkin = namespace.add_permission( name='checkin_document', label=_('Check in documents') diff --git a/mayan/apps/common/permissions_runtime.py b/mayan/apps/common/permissions_runtime.py index 25527c34cf..9dc4e4797e 100644 --- a/mayan/apps/common/permissions_runtime.py +++ b/mayan/apps/common/permissions_runtime.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('common', _('Common')) +namespace = PermissionNamespace(label=_('Common'), name='common') permission_error_log_view = namespace.add_permission( name='error_log_view', label=_('View error log') diff --git a/mayan/apps/converter/permissions.py b/mayan/apps/converter/permissions.py index cbb575a0e9..5868f0c070 100644 --- a/mayan/apps/converter/permissions.py +++ b/mayan/apps/converter/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('converter', _('Converter')) +namespace = PermissionNamespace(label=_('Converter'), name='converter') permission_transformation_create = namespace.add_permission( name='transformation_create', label=_('Create new transformations') diff --git a/mayan/apps/django_gpg/permissions.py b/mayan/apps/django_gpg/permissions.py index b6b1d14144..ee129ab114 100644 --- a/mayan/apps/django_gpg/permissions.py +++ b/mayan/apps/django_gpg/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('django_gpg', _('Key management')) +namespace = PermissionNamespace(label=_('Key management'), name='django_gpg') permission_key_delete = namespace.add_permission( name='key_delete', label=_('Delete keys') diff --git a/mayan/apps/document_comments/permissions.py b/mayan/apps/document_comments/permissions.py index cdd02aa14b..3edd1a7dff 100644 --- a/mayan/apps/document_comments/permissions.py +++ b/mayan/apps/document_comments/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('comments', _('Comments')) +namespace = PermissionNamespace(label=_('Comments'), name='comments') permission_comment_create = namespace.add_permission( name='comment_create', label=_('Create new comments') diff --git a/mayan/apps/document_indexing/permissions.py b/mayan/apps/document_indexing/permissions.py index f907bf6e13..33a44f5787 100644 --- a/mayan/apps/document_indexing/permissions.py +++ b/mayan/apps/document_indexing/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('document_indexing', _('Indexing')) +namespace = PermissionNamespace(label=_('Indexing'), name='document_indexing') permission_document_indexing_create = namespace.add_permission( name='document_index_create', label=_('Create new document indexes') diff --git a/mayan/apps/document_parsing/permissions.py b/mayan/apps/document_parsing/permissions.py index 5ae8c03744..d06198a9b7 100644 --- a/mayan/apps/document_parsing/permissions.py +++ b/mayan/apps/document_parsing/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('document_parsing', _('Document parsing')) +namespace = PermissionNamespace(label=_('Document parsing'), name='document_parsing') permission_content_view = namespace.add_permission( name='content_view', label=_('View the content of a document') diff --git a/mayan/apps/document_signatures/permissions.py b/mayan/apps/document_signatures/permissions.py index 4e8d5cd770..ca5f8d6ddb 100644 --- a/mayan/apps/document_signatures/permissions.py +++ b/mayan/apps/document_signatures/permissions.py @@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace namespace = PermissionNamespace( - 'document_signatures', _('Document signatures') + label=_('Document signatures'), name='document_signatures' ) permission_document_version_sign_detached = namespace.add_permission( diff --git a/mayan/apps/document_states/permissions.py b/mayan/apps/document_states/permissions.py index 4c37bcabf9..43f974cde1 100644 --- a/mayan/apps/document_states/permissions.py +++ b/mayan/apps/document_states/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('document_states', _('Document workflows')) +namespace = PermissionNamespace(label=_('Document workflows'), name='document_states') permission_workflow_create = namespace.add_permission( name='workflow_create', label=_('Create workflows') diff --git a/mayan/apps/documents/permissions.py b/mayan/apps/documents/permissions.py index dc3d867f2b..4cd78f4c89 100644 --- a/mayan/apps/documents/permissions.py +++ b/mayan/apps/documents/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('documents', _('Documents')) +namespace = PermissionNamespace(label=_('Documents'), name='documents') permission_document_create = namespace.add_permission( name='document_create', label=_('Create documents') @@ -52,7 +52,7 @@ permission_empty_trash = namespace.add_permission( ) setup_namespace = PermissionNamespace( - 'documents_types', label=_('Document types') + label=_('Document types'), name='documents_types' ) permission_document_type_create = setup_namespace.add_permission( name='document_type_create', label=_('Create document types') diff --git a/mayan/apps/events/permissions.py b/mayan/apps/events/permissions.py index 92df60d901..dc04070ce0 100644 --- a/mayan/apps/events/permissions.py +++ b/mayan/apps/events/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('events', _('Events')) +namespace = PermissionNamespace(label=_('Events'), name='events') permission_events_view = namespace.add_permission( name='events_view', label=_('Access the events of an object') ) diff --git a/mayan/apps/file_metadata/permissions.py b/mayan/apps/file_metadata/permissions.py index 9aa0c3aeee..c0d156f888 100644 --- a/mayan/apps/file_metadata/permissions.py +++ b/mayan/apps/file_metadata/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('file_metadata', _('File metadata')) +namespace = PermissionNamespace(label=_('File metadata'), name='file_metadata') permission_document_type_file_metadata_setup = namespace.add_permission( name='file_metadata_document_type_setup', diff --git a/mayan/apps/linking/permissions.py b/mayan/apps/linking/permissions.py index 9709dd6be4..0d6d3a47a7 100644 --- a/mayan/apps/linking/permissions.py +++ b/mayan/apps/linking/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('linking', _('Smart links')) +namespace = PermissionNamespace(label=_('Smart links'), name='linking') permission_smart_link_view = namespace.add_permission( name='smart_link_view', label=_('View existing smart links') diff --git a/mayan/apps/mailer/permissions.py b/mayan/apps/mailer/permissions.py index fddd6f30b6..614dc71d0a 100644 --- a/mayan/apps/mailer/permissions.py +++ b/mayan/apps/mailer/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('mailing', _('Mailing')) +namespace = PermissionNamespace(label=_('Mailing'), name='mailing') permission_mailing_link = namespace.add_permission( name='mail_link', label=_('Send document link via email') diff --git a/mayan/apps/mayan_statistics/permissions.py b/mayan/apps/mayan_statistics/permissions.py index 6cd42d3361..2d111b41ac 100644 --- a/mayan/apps/mayan_statistics/permissions.py +++ b/mayan/apps/mayan_statistics/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('statistics', _('Statistics')) +namespace = PermissionNamespace(label=_('Statistics'), name='statistics') permission_statistics_view = namespace.add_permission( name='statistics_view', label=_('View statistics') diff --git a/mayan/apps/metadata/permissions.py b/mayan/apps/metadata/permissions.py index d39128ed60..6e82f55d28 100644 --- a/mayan/apps/metadata/permissions.py +++ b/mayan/apps/metadata/permissions.py @@ -4,7 +4,8 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('metadata', _('Metadata')) +namespace = PermissionNamespace(label=_('Metadata'), name='metadata') + permission_metadata_document_edit = namespace.add_permission( name='metadata_document_edit', label=_('Edit a document\'s metadata') ) @@ -18,7 +19,8 @@ permission_metadata_document_view = namespace.add_permission( name='metadata_document_view', label=_('View metadata from a document') ) -setup_namespace = PermissionNamespace('metadata_setup', _('Metadata setup')) +setup_namespace = PermissionNamespace(label=_('Metadata setup'), name='metadata_setup') + permission_metadata_type_edit = setup_namespace.add_permission( name='metadata_type_edit', label=_('Edit metadata types') ) diff --git a/mayan/apps/motd/permissions.py b/mayan/apps/motd/permissions.py index 00b6e50611..ab0ff47fa9 100644 --- a/mayan/apps/motd/permissions.py +++ b/mayan/apps/motd/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('motd', _('Message of the day')) +namespace = PermissionNamespace(label=_('Message of the day'), name='motd') permission_message_create = namespace.add_permission( name='message_create', label=_('Create messages') diff --git a/mayan/apps/navigation/tests/test_classes.py b/mayan/apps/navigation/tests/test_classes.py index bd14e0c4d1..d968e49b34 100644 --- a/mayan/apps/navigation/tests/test_classes.py +++ b/mayan/apps/navigation/tests/test_classes.py @@ -27,7 +27,7 @@ class LinkClassTestCase(GenericViewTestCase): self.add_test_view(test_object=self.group) self.namespace = PermissionNamespace( - TEST_PERMISSION_NAMESPACE_NAME, TEST_PERMISSION_NAMESPACE_TEXT + label=TEST_PERMISSION_NAMESPACE_TEXT, name=TEST_PERMISSION_NAMESPACE_NAME ) self.permission = self.namespace.add_permission( @@ -159,7 +159,7 @@ class MenuClassTestCase(GenericViewTestCase): self.add_test_view(test_object=self.group) self.namespace = PermissionNamespace( - TEST_PERMISSION_NAMESPACE_NAME, TEST_PERMISSION_NAMESPACE_TEXT + label=TEST_PERMISSION_NAMESPACE_TEXT, name=TEST_PERMISSION_NAMESPACE_NAME ) self.permission = self.namespace.add_permission( diff --git a/mayan/apps/ocr/permissions.py b/mayan/apps/ocr/permissions.py index 669b932157..8e6c0f6ed4 100644 --- a/mayan/apps/ocr/permissions.py +++ b/mayan/apps/ocr/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('ocr', _('OCR')) +namespace = PermissionNamespace(label=_('OCR'), name='ocr') permission_ocr_document = namespace.add_permission( name='ocr_document', label=_('Submit documents for OCR') diff --git a/mayan/apps/permissions/classes.py b/mayan/apps/permissions/classes.py index 28141dce9d..96220276f7 100644 --- a/mayan/apps/permissions/classes.py +++ b/mayan/apps/permissions/classes.py @@ -32,9 +32,9 @@ class PermissionNamespace(object): '"purgepermissions" and try again.' ) - def __init__(self, name, label): - self.name = name + def __init__(self, label, name): self.label = label + self.name = name self.permissions = [] self.__class__._registry[name] = self @@ -83,9 +83,9 @@ class Permission(object): if permissions.stored_permission.requester_has_this(requester): return True - logger.debug('User "%s" does not have permissions "%s"', - requester, - permissions) + logger.debug( + 'User "%s" does not have permissions "%s"', requester, permissions + ) raise PermissionDenied(_('Insufficient permissions.')) @classmethod diff --git a/mayan/apps/permissions/permissions.py b/mayan/apps/permissions/permissions.py index 3d1ee0c371..1543ab065f 100644 --- a/mayan/apps/permissions/permissions.py +++ b/mayan/apps/permissions/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from . import PermissionNamespace -namespace = PermissionNamespace('permissions', _('Permissions')) +namespace = PermissionNamespace(label=_('Permissions'), name='permissions') permission_role_view = namespace.add_permission( name='role_view', label=_('View roles') diff --git a/mayan/apps/permissions/views.py b/mayan/apps/permissions/views.py index e5ceb71ce3..0e6c27e761 100644 --- a/mayan/apps/permissions/views.py +++ b/mayan/apps/permissions/views.py @@ -139,7 +139,7 @@ class SetupRolePermissionsView(AssignRemoveView): (force_text(permission.pk), permission) for permission in permissions ] results.append( - (PermissionNamespace.get(namespace), permission_options) + (PermissionNamespace.get(name=namespace), permission_options) ) return results diff --git a/mayan/apps/smart_settings/permissions.py b/mayan/apps/smart_settings/permissions.py index e14544944a..c28d9a417b 100644 --- a/mayan/apps/smart_settings/permissions.py +++ b/mayan/apps/smart_settings/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('smart_settings', _('Smart settings')) +namespace = PermissionNamespace(label=_('Smart settings'), name='smart_settings') permission_settings_edit = namespace.add_permission( name='permission_settings_edit', label=_('Edit settings') diff --git a/mayan/apps/sources/permissions.py b/mayan/apps/sources/permissions.py index 2d09a8a5e7..94bb90e45b 100644 --- a/mayan/apps/sources/permissions.py +++ b/mayan/apps/sources/permissions.py @@ -4,7 +4,8 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('sources_setup', _('Sources setup')) +namespace = PermissionNamespace(label=_('Sources setup'), name='source_setup') + permission_sources_setup_create = namespace.add_permission( name='sources_setup_create', label=_('Create new document sources') ) diff --git a/mayan/apps/tags/permissions.py b/mayan/apps/tags/permissions.py index 3d498787dc..ea209595ad 100644 --- a/mayan/apps/tags/permissions.py +++ b/mayan/apps/tags/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('tags', _('Tags')) +namespace = PermissionNamespace(label=_('Tags'), name='tags') permission_tag_create = namespace.add_permission( name='tag_create', label=_('Create new tags') diff --git a/mayan/apps/task_manager/permissions.py b/mayan/apps/task_manager/permissions.py index 31e6765690..c475da7758 100644 --- a/mayan/apps/task_manager/permissions.py +++ b/mayan/apps/task_manager/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('task_manager', _('Task manager')) +namespace = PermissionNamespace(label=_('Task manager'), name='task_manager') permission_task_view = namespace.add_permission( name='task_view', label=_('View tasks') diff --git a/mayan/apps/user_management/permissions.py b/mayan/apps/user_management/permissions.py index e2eca5f948..944bbc3ef3 100644 --- a/mayan/apps/user_management/permissions.py +++ b/mayan/apps/user_management/permissions.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.permissions import PermissionNamespace -namespace = PermissionNamespace('user_management', _('User management')) +namespace = PermissionNamespace(label=_('User management'), name='user_management') permission_group_create = namespace.add_permission( name='group_create', label=_('Create new groups')