diff --git a/mayan/apps/acls/views.py b/mayan/apps/acls/views.py index 54c928b80c..ae246cf40c 100644 --- a/mayan/apps/acls/views.py +++ b/mayan/apps/acls/views.py @@ -98,7 +98,7 @@ class ACLCreateView(SingleObjectCreateView): return super(ACLCreateView, self).form_valid(form) def get_success_url(self): - return reverse('acls:acl_permissions', args=[self.instance.pk]) + return reverse('acls:acl_permissions', args=(self.instance.pk,)) def get_extra_context(self): return { diff --git a/mayan/apps/checkouts/models.py b/mayan/apps/checkouts/models.py index 2aa28c7d79..386ff139ec 100644 --- a/mayan/apps/checkouts/models.py +++ b/mayan/apps/checkouts/models.py @@ -51,7 +51,7 @@ class DocumentCheckout(models.Model): return unicode(self.document) def get_absolute_url(self): - return reverse('checkout:checkout_info', args=[self.document.pk]) + return reverse('checkout:checkout_info', args=(self.document.pk,)) def clean(self): if self.expiration_datetime < now(): diff --git a/mayan/apps/django_gpg/links.py b/mayan/apps/django_gpg/links.py index 529b2cd017..6a4e2fafdb 100644 --- a/mayan/apps/django_gpg/links.py +++ b/mayan/apps/django_gpg/links.py @@ -19,7 +19,7 @@ link_public_keys = Link( ) link_key_delete = Link( permissions=(permission_key_delete,), tags='dangerous', text=_('Delete'), - view='django_gpg:key_delete', args=['object.fingerprint', 'object.type'] + view='django_gpg:key_delete', args=('object.fingerprint', 'object.type',) ) link_key_query = Link( diff --git a/mayan/apps/document_indexing/models.py b/mayan/apps/document_indexing/models.py index af276c14c4..530e461baf 100644 --- a/mayan/apps/document_indexing/models.py +++ b/mayan/apps/document_indexing/models.py @@ -56,7 +56,7 @@ class Index(models.Model): try: return reverse( 'indexing:index_instance_node_view', - args=[self.instance_root.pk] + args=(self.instance_root.pk,) ) except IndexInstanceNode.DoesNotExist: return '#' @@ -161,7 +161,7 @@ class IndexInstanceNode(MPTTModel): return self.value def get_absolute_url(self): - return reverse('indexing:index_instance_node_view', args=[self.pk]) + return reverse('indexing:index_instance_node_view', args=(self.pk,)) @property def children(self): diff --git a/mayan/apps/document_states/models.py b/mayan/apps/document_states/models.py index 49d84482b2..f4035ed846 100644 --- a/mayan/apps/document_states/models.py +++ b/mayan/apps/document_states/models.py @@ -134,7 +134,7 @@ class WorkflowInstance(models.Model): def get_absolute_url(self): return reverse( - 'document_states:workflow_instance_detail', args=[str(self.pk)] + 'document_states:workflow_instance_detail', args=(str(self.pk),) ) def do_transition(self, comment, transition, user): diff --git a/mayan/apps/document_states/views.py b/mayan/apps/document_states/views.py index c5292b3874..f7e261a01f 100644 --- a/mayan/apps/document_states/views.py +++ b/mayan/apps/document_states/views.py @@ -309,7 +309,7 @@ class SetupWorkflowStateCreateView(SingleObjectCreateView): def get_success_url(self): return reverse( - 'document_states:setup_workflow_states', args=[self.kwargs['pk']] + 'document_states:setup_workflow_states', args=(self.kwargs['pk'],) ) def form_valid(self, form): @@ -333,7 +333,7 @@ class SetupWorkflowStateDeleteView(SingleObjectDeleteView): def get_success_url(self): return reverse( 'document_states:setup_workflow_States', - args=[self.get_object().workflow.pk] + args=(self.get_object().workflow.pk,) ) @@ -352,7 +352,7 @@ class SetupWorkflowStateEditView(SingleObjectEditView): def get_success_url(self): return reverse( 'document_states:setup_workflow_states', - args=[self.get_object().workflow.pk] + args=(self.get_object().workflow.pk,) ) @@ -431,7 +431,7 @@ class SetupWorkflowTransitionCreateView(SingleObjectCreateView): def get_success_url(self): return reverse( 'document_states:setup_workflow_transitions', - args=[self.kwargs['pk']] + args=(self.kwargs['pk'],) ) def form_valid(self, form): @@ -464,7 +464,7 @@ class SetupWorkflowTransitionDeleteView(SingleObjectDeleteView): def get_success_url(self): return reverse( 'document_states:setup_workflow_transitions', - args=[self.get_object().workflow.pk] + args=(self.get_object().workflow.pk,) ) @@ -490,5 +490,5 @@ class SetupWorkflowTransitionEditView(SingleObjectEditView): def get_success_url(self): return reverse( 'document_states:setup_workflow_transitions', - args=[self.get_object().workflow.pk] + args=(self.get_object().workflow.pk,) ) diff --git a/mayan/apps/documents/models.py b/mayan/apps/documents/models.py index 8167a2d4a8..11533a5c7f 100644 --- a/mayan/apps/documents/models.py +++ b/mayan/apps/documents/models.py @@ -188,7 +188,7 @@ class Document(models.Model): return self.label or ugettext('Document stub, id: %d') % self.pk def get_absolute_url(self): - return reverse('documents:document_preview', args=[self.pk]) + return reverse('documents:document_preview', args=(self.pk,)) def save(self, *args, **kwargs): user = kwargs.pop('_user', None) @@ -636,7 +636,7 @@ class DocumentPage(models.Model): verbose_name_plural = _('Document pages') def get_absolute_url(self): - return reverse('documents:document_page_view', args=[self.pk]) + return reverse('documents:document_page_view', args=(self.pk,)) def delete(self, *args, **kwargs): self.invalidate_cache() diff --git a/mayan/apps/documents/signals.py b/mayan/apps/documents/signals.py index b202749630..b0832d66bf 100644 --- a/mayan/apps/documents/signals.py +++ b/mayan/apps/documents/signals.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals from django.dispatch import Signal -post_version_upload = Signal(providing_args=['instance'], use_caching=True) +post_version_upload = Signal(providing_args=('instance',), use_caching=True) post_document_type_change = Signal( - providing_args=['instance'], use_caching=True + providing_args=('instance',), use_caching=True ) -post_document_created = Signal(providing_args=['instance'], use_caching=True) +post_document_created = Signal(providing_args=('instance',), use_caching=True) diff --git a/mayan/apps/documents/tests/test_api.py b/mayan/apps/documents/tests/test_api.py index 19dfe52703..5cde546ae1 100644 --- a/mayan/apps/documents/tests/test_api.py +++ b/mayan/apps/documents/tests/test_api.py @@ -47,7 +47,7 @@ class DocumentTypeAPITestCase(APITestCase): document_type = DocumentType.objects.create(label=TEST_DOCUMENT_TYPE) self.client.put( - reverse('rest_api:documenttype-detail', args=[document_type.pk]), + reverse('rest_api:documenttype-detail', args=(document_type.pk,)), {'label': TEST_DOCUMENT_TYPE + 'edited'} ) @@ -58,7 +58,7 @@ class DocumentTypeAPITestCase(APITestCase): document_type = DocumentType.objects.create(label=TEST_DOCUMENT_TYPE) self.client.patch( - reverse('rest_api:documenttype-detail', args=[document_type.pk]), + reverse('rest_api:documenttype-detail', args=(document_type.pk,)), {'label': TEST_DOCUMENT_TYPE + 'edited'} ) diff --git a/mayan/apps/documents/tests/test_views.py b/mayan/apps/documents/tests/test_views.py index 2691a0e3fd..005732dc90 100644 --- a/mayan/apps/documents/tests/test_views.py +++ b/mayan/apps/documents/tests/test_views.py @@ -55,14 +55,14 @@ class DocumentsViewsFunctionalTestCase(TestCase): # Trash the document self.client.post( - reverse('documents:document_trash', args=[self.document.pk]) + reverse('documents:document_trash', args=(self.document.pk,)) ) self.assertEqual(DeletedDocument.objects.count(), 1) self.assertEqual(Document.objects.count(), 0) # Restore the document self.client.post( - reverse('documents:document_restore', args=[self.document.pk]) + reverse('documents:document_restore', args=(self.document.pk,)) ) self.assertEqual(DeletedDocument.objects.count(), 0) self.assertEqual(Document.objects.count(), 1) @@ -72,14 +72,14 @@ class DocumentsViewsFunctionalTestCase(TestCase): # Trash the document self.client.post( - reverse('documents:document_trash', args=[self.document.pk]) + reverse('documents:document_trash', args=(self.document.pk,)) ) self.assertEqual(DeletedDocument.objects.count(), 1) self.assertEqual(Document.objects.count(), 0) # Delete the document self.client.post( - reverse('documents:document_delete', args=[self.document.pk]) + reverse('documents:document_delete', args=(self.document.pk,)) ) self.assertEqual(DeletedDocument.objects.count(), 0) self.assertEqual(Document.objects.count(), 0) @@ -90,7 +90,7 @@ class DocumentsViewsFunctionalTestCase(TestCase): # test document simple view response = self.client.get( - reverse('documents:document_properties', args=[self.document.pk]) + reverse('documents:document_properties', args=(self.document.pk,)) ) self.assertContains( response, 'roperties for document', status_code=200 @@ -118,7 +118,7 @@ class DocumentsViewsFunctionalTestCase(TestCase): # Edit the document type response = self.client.post( reverse( - 'documents:document_type_edit', args=[self.document_type.pk] + 'documents:document_type_edit', args=(self.document_type.pk,) ), data={'name': TEST_DOCUMENT_TYPE + 'partial'}, follow=True ) #TODO: FIX @@ -138,7 +138,7 @@ class DocumentsViewsFunctionalTestCase(TestCase): # Delete the document type #response = self.client.post( # reverse( - # 'documents:document_type_delete', args=[self.document_type.pk] + # 'documents:document_type_delete', args=(self.document_type.pk,) # ), follow=True #) #TODO: FIX# diff --git a/mayan/apps/documents/views.py b/mayan/apps/documents/views.py index 5afa5777f9..01cc726d62 100644 --- a/mayan/apps/documents/views.py +++ b/mayan/apps/documents/views.py @@ -775,7 +775,7 @@ def document_page_view(request, document_page_id): def document_page_view_reset(request, document_page_id): - return HttpResponseRedirect(reverse('documents:document_page_view', args=[document_page_id])) + return HttpResponseRedirect(reverse('documents:document_page_view', args=(document_page_id,))) def document_page_navigation_next(request, document_page_id): @@ -793,7 +793,7 @@ def document_page_navigation_next(request, document_page_id): return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))) else: document_page = get_object_or_404(document_page.siblings, page_number=document_page.page_number + 1) - return HttpResponseRedirect('{0}?{1}'.format(reverse(view, args=[document_page.pk]), request.GET.urlencode())) + return HttpResponseRedirect('{0}?{1}'.format(reverse(view, args=(document_page.pk,)), request.GET.urlencode())) def document_page_navigation_previous(request, document_page_id): @@ -811,7 +811,7 @@ def document_page_navigation_previous(request, document_page_id): return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))) else: document_page = get_object_or_404(document_page.siblings, page_number=document_page.page_number - 1) - return HttpResponseRedirect('{0}?{1}'.format(reverse(view, args=[document_page.pk]), request.GET.urlencode())) + return HttpResponseRedirect('{0}?{1}'.format(reverse(view, args=(document_page.pk,)), request.GET.urlencode())) def document_page_navigation_first(request, document_page_id): @@ -825,7 +825,7 @@ def document_page_navigation_first(request, document_page_id): view = resolve(urlparse.urlparse(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))).path).view_name - return HttpResponseRedirect('{0}?{1}'.format(reverse(view, args=[document_page.pk]), request.GET.urlencode())) + return HttpResponseRedirect('{0}?{1}'.format(reverse(view, args=(document_page.pk,)), request.GET.urlencode())) def document_page_navigation_last(request, document_page_id): @@ -839,7 +839,7 @@ def document_page_navigation_last(request, document_page_id): view = resolve(urlparse.urlparse(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL))).path).view_name - return HttpResponseRedirect('{0}?{1}'.format(reverse(view, args=[document_page.pk]), request.GET.urlencode())) + return HttpResponseRedirect('{0}?{1}'.format(reverse(view, args=(document_page.pk,)), request.GET.urlencode())) def transform_page(request, document_page_id, zoom_function=None, rotation_function=None): @@ -1044,7 +1044,7 @@ def document_type_filename_delete(request, document_type_filename_id): Permission.check_permissions(request.user, (permission_document_type_edit,)) document_type_filename = get_object_or_404(DocumentTypeFilename, pk=document_type_filename_id) - post_action_redirect = reverse('documents:document_type_filename_list', args=[document_type_filename.document_type_id]) + post_action_redirect = reverse('documents:document_type_filename_list', args=(document_type_filename.document_type_id,)) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))) next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))) @@ -1091,7 +1091,7 @@ def document_type_filename_create(request, document_type_id): ) document_type_filename.save() messages.success(request, _('Document type filename created successfully')) - return HttpResponseRedirect(reverse('documents:document_type_filename_list', args=[document_type_id])) + return HttpResponseRedirect(reverse('documents:document_type_filename_list', args=(document_type_id,))) except Exception as exception: messages.error(request, _('Error creating document type filename; %(error)s') % { 'error': exception}) diff --git a/mayan/apps/documents/widgets.py b/mayan/apps/documents/widgets.py index 5312d477b4..77845c694f 100644 --- a/mayan/apps/documents/widgets.py +++ b/mayan/apps/documents/widgets.py @@ -118,7 +118,7 @@ def document_html_widget(document_page, click_view=None, click_view_arguments=No query_string = urlencode(query_dict) preview_view = '%s?%s' % ( - reverse('rest_api:documentpage-image', args=[document_page.pk]), query_string + reverse('rest_api:documentpage-image', args=(document_page.pk,)), query_string ) result.append( diff --git a/mayan/apps/folders/models.py b/mayan/apps/folders/models.py index 007313cfad..bd5ef7341e 100644 --- a/mayan/apps/folders/models.py +++ b/mayan/apps/folders/models.py @@ -30,7 +30,7 @@ class Folder(models.Model): return self.label def get_absolute_url(self): - return reverse('folders:folder_view', args=[self.pk]) + return reverse('folders:folder_view', args=(self.pk,)) def get_document_count(self, user): queryset = self.documents diff --git a/mayan/apps/linking/links.py b/mayan/apps/linking/links.py index 84f8d6158f..1c4807c8c7 100644 --- a/mayan/apps/linking/links.py +++ b/mayan/apps/linking/links.py @@ -45,9 +45,9 @@ link_smart_link_edit = Link( ) link_smart_link_instance_view = Link( permissions=(permission_smart_link_view,), text=_('Documents'), - view='linking:smart_link_instance_view', args=[ - 'document.pk', 'object.pk' - ] + view='linking:smart_link_instance_view', args=( + 'document.pk', 'object.pk', + ) ) link_smart_link_instances_for_document = Link( permissions=(permission_document_view,), text=_('Smart links'), diff --git a/mayan/apps/linking/views.py b/mayan/apps/linking/views.py index 171961bd54..3effd5fce6 100644 --- a/mayan/apps/linking/views.py +++ b/mayan/apps/linking/views.py @@ -291,7 +291,7 @@ def smart_link_condition_create(request, smart_link_pk): ) return HttpResponseRedirect( reverse( - 'linking:smart_link_condition_list', args=[smart_link.pk] + 'linking:smart_link_condition_list', args=(smart_link.pk,) ) ) else: diff --git a/mayan/apps/metadata/views.py b/mayan/apps/metadata/views.py index 66673da4c1..dd1f4e467f 100644 --- a/mayan/apps/metadata/views.py +++ b/mayan/apps/metadata/views.py @@ -296,7 +296,7 @@ def metadata_add(request, document_id=None, document_id_list=None): if len(documents) == 1: return HttpResponseRedirect('%s?%s' % ( - reverse('metadata:metadata_edit', args=[document.pk]), + reverse('metadata:metadata_edit', args=(document.pk,)), urlencode({'next': next})) ) elif len(documents) > 1: diff --git a/mayan/apps/ocr/apps.py b/mayan/apps/ocr/apps.py index 9d3cc2ffd7..0431f06c94 100644 --- a/mayan/apps/ocr/apps.py +++ b/mayan/apps/ocr/apps.py @@ -40,11 +40,11 @@ logger = logging.getLogger(__name__) def document_ocr_submit(self): - task_do_ocr.apply_async(args=[self.latest_version.pk]) + task_do_ocr.apply_async(args=(self.latest_version.pk,)) def document_version_ocr_submit(self): - task_do_ocr.apply_async(args=[self.pk]) + task_do_ocr.apply_async(args=(self.pk,)) class OCRApp(MayanAppConfig): diff --git a/mayan/apps/ocr/signals.py b/mayan/apps/ocr/signals.py index 872f7916c6..68a6afe2ce 100644 --- a/mayan/apps/ocr/signals.py +++ b/mayan/apps/ocr/signals.py @@ -3,5 +3,5 @@ from __future__ import unicode_literals from django.dispatch import Signal post_document_version_ocr = Signal( - providing_args=['instance'], use_caching=True + providing_args=('instance',), use_caching=True ) diff --git a/mayan/apps/sources/links.py b/mayan/apps/sources/links.py index 9173eeabd2..b852b05de5 100644 --- a/mayan/apps/sources/links.py +++ b/mayan/apps/sources/links.py @@ -57,11 +57,11 @@ link_setup_source_create_webform = Link( link_setup_source_delete = Link( permissions=(permission_sources_setup_delete,), tags='dangerous', text=_('Delete'), view='sources:setup_source_delete', - args=['resolved_object.pk'] + args=('resolved_object.pk',) ) link_setup_source_edit = Link( text=_('Edit'), view='sources:setup_source_edit', - args=['resolved_object.pk'], permissions=(permission_sources_setup_edit,) + args=('resolved_object.pk',), permissions=(permission_sources_setup_edit,) ) link_source_list = Link( permissions=(permission_sources_setup_view,), text=_('Document sources'), @@ -71,7 +71,7 @@ link_staging_file_delete = Link( keep_query=True, permissions=(permission_document_new_version, permission_document_create), tags='dangerous', text=_('Delete'), view='sources:staging_file_delete', - args=['source.pk', 'object.encoded_filename'] + args=('source.pk', 'object.encoded_filename',) ) link_upload_version = Link( permissions=(permission_document_new_version,), @@ -80,5 +80,5 @@ link_upload_version = Link( ) link_setup_source_logs = Link( text=_('Logs'), view='sources:setup_source_logs', - args=['resolved_object.pk'], permissions=(permission_sources_setup_view,) + args=('resolved_object.pk',), permissions=(permission_sources_setup_view,) ) diff --git a/mayan/apps/sources/serializers.py b/mayan/apps/sources/serializers.py index 0c4631d780..1b2e9d58f5 100644 --- a/mayan/apps/sources/serializers.py +++ b/mayan/apps/sources/serializers.py @@ -18,14 +18,14 @@ class StagingFolderFileSerializer(serializers.Serializer): def get_url(self, obj): return reverse( 'stagingfolderfile-detail', - args=[obj.staging_folder.pk, obj.encoded_filename], + args=(obj.staging_folder.pk, obj.encoded_filename,), request=self.context.get('request') ) def get_image_url(self, obj): return reverse( 'stagingfolderfile-image-view', - args=[obj.staging_folder.pk, obj.encoded_filename], + args=(obj.staging_folder.pk, obj.encoded_filename,), request=self.context.get('request') ) diff --git a/mayan/apps/sources/tests/test_views.py b/mayan/apps/sources/tests/test_views.py index 2c7626a803..7c3bc53e7b 100644 --- a/mayan/apps/sources/tests/test_views.py +++ b/mayan/apps/sources/tests/test_views.py @@ -49,7 +49,7 @@ class UploadDocumentTestCase(TestCase): # Create new webform source self.client.post( reverse( - 'sources:setup_source_create', args=[SOURCE_CHOICE_WEB_FORM] + 'sources:setup_source_create', args=(SOURCE_CHOICE_WEB_FORM,) ), {'label': 'test', 'uncompress': 'n', 'enabled': True} ) self.assertEqual(WebFormSource.objects.count(), 1) @@ -90,7 +90,7 @@ class UploadDocumentTestCase(TestCase): # Create new webform source self.client.post( reverse( - 'sources:setup_source_create', args=[SOURCE_CHOICE_WEB_FORM] + 'sources:setup_source_create', args=(SOURCE_CHOICE_WEB_FORM,) ), {'label': 'test', 'uncompress': 'n', 'enabled': True} ) self.assertEqual(WebFormSource.objects.count(), 1) @@ -118,7 +118,7 @@ class UploadDocumentTestCase(TestCase): # Test for issue 25 during editing self.client.post( - reverse('documents:document_edit', args=[document.pk]), + reverse('documents:document_edit', args=(document.pk,)), { 'description': TEST_DOCUMENT_DESCRIPTION, 'language': document.language, 'label': document.label diff --git a/mayan/apps/sources/views.py b/mayan/apps/sources/views.py index 5daa981b8a..2d013947bb 100644 --- a/mayan/apps/sources/views.py +++ b/mayan/apps/sources/views.py @@ -347,7 +347,7 @@ class UploadInteractiveVersionView(UploadBaseView): _('New document version queued for uploaded and will be available shortly.') ) return HttpResponseRedirect( - reverse('documents:document_version_list', args=[self.document.pk]) + reverse('documents:document_version_list', args=(self.document.pk,)) ) def create_source_form_form(self, **kwargs): diff --git a/mayan/apps/sources/widgets.py b/mayan/apps/sources/widgets.py index ae8a4c5029..acde863355 100644 --- a/mayan/apps/sources/widgets.py +++ b/mayan/apps/sources/widgets.py @@ -41,9 +41,9 @@ def staging_file_html_widget(staging_file, click_view=None, page=DEFAULT_PAGE_NU preview_view = '%s?%s' % ( reverse( 'rest_api:stagingfolderfile-image-view', - args=[ - staging_file.staging_folder.pk, staging_file.encoded_filename - ] + args=( + staging_file.staging_folder.pk, staging_file.encoded_filename, + ) ), query_string ) @@ -73,10 +73,10 @@ def staging_file_html_widget(staging_file, click_view=None, page=DEFAULT_PAGE_NU '%s?%s' % ( reverse( click_view, - args=[ + args=( staging_file.staging_folder.pk, - staging_file.encoded_filename - ] + staging_file.encoded_filename, + ) ), query_string ), title_template diff --git a/mayan/apps/user_management/views.py b/mayan/apps/user_management/views.py index 1df5c113c2..a51ef16de3 100644 --- a/mayan/apps/user_management/views.py +++ b/mayan/apps/user_management/views.py @@ -86,7 +86,7 @@ def user_add(request): request, _('User "%s" created successfully.') % user ) return HttpResponseRedirect( - reverse('user_management:user_set_password', args=[user.pk]) + reverse('user_management:user_set_password', args=(user.pk,)) ) else: form = UserForm()