matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace unused lists with tuples.

Browse Source
This commit is contained in:
Roberto Rosario
2015-08-19 13:57:38 -04:00
parent 610b06bb4d
commit 683e54fea1
24 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mayan/apps/acls/views.py
View File

@@ -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 {

2
mayan/apps/checkouts/models.py
View File

@@ -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():

2
mayan/apps/django_gpg/links.py
View File

@@ -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(

4
mayan/apps/document_indexing/models.py
View File

@@ -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):

2
mayan/apps/document_states/models.py
View File

@@ -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):

12
mayan/apps/document_states/views.py
View File

@@ -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,)
)

4
mayan/apps/documents/models.py
View File

@@ -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()

6
mayan/apps/documents/signals.py
View File

@@ -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)

4
mayan/apps/documents/tests/test_api.py
View File

@@ -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'}
)

14
mayan/apps/documents/tests/test_views.py
View File

@@ -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#

14
mayan/apps/documents/views.py
View File

@@ -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})

2
mayan/apps/documents/widgets.py
View File

@@ -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(

2
mayan/apps/folders/models.py
View File

@@ -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

6
mayan/apps/linking/links.py
View File

@@ -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'),

2
mayan/apps/linking/views.py
View File

@@ -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:

2
mayan/apps/metadata/views.py
View File

@@ -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:

4
mayan/apps/ocr/apps.py
View File

@@ -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):

2
mayan/apps/ocr/signals.py
View File

@@ -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
)

8
mayan/apps/sources/links.py
View File

@@ -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,)
)

4
mayan/apps/sources/serializers.py
View File

@@ -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')
)

6
mayan/apps/sources/tests/test_views.py
View File

@@ -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

2
mayan/apps/sources/views.py
View File

@@ -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):

12
mayan/apps/sources/widgets.py
View File

@@ -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

2
mayan/apps/user_management/views.py
View File

@@ -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()