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

PEP8 cleanups.

Browse Source
This commit is contained in:
Roberto Rosario
2016-03-19 03:00:03 -04:00
parent 7cde1fe78f
commit 145161cef4
8 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mayan/apps/acls/tests/test_views.py
View File

@@ -2,7 +2,6 @@ from __future__ import absolute_import, unicode_literals
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from documents.permissions import permission_document_view
from documents.tests.test_views import GenericDocumentViewTestCase from documents.tests.test_views import GenericDocumentViewTestCase
from user_management.tests import ( from user_management.tests import (
TEST_USER_USERNAME, TEST_USER_PASSWORD TEST_USER_USERNAME, TEST_USER_PASSWORD

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

@@ -3,7 +3,6 @@ from __future__ import absolute_import, unicode_literals
import itertools import itertools
import logging import logging
from django.contrib import messages
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse

4
mayan/apps/common/generics.py
View File

@@ -282,7 +282,7 @@ class SingleObjectCreateView(ObjectNameMixin, ViewPermissionCheckMixin, ExtraCon
messages.error( messages.error(
self.request, self.request,
_('%(object)s not created, error: %(error)s') % { _('%(object)s not created, error: %(error)s') % {
'object': self.get_object_name(), 'object': self.get_object_name(context=context),
'error': exception 'error': exception
} }
) )
@@ -293,7 +293,7 @@ class SingleObjectCreateView(ObjectNameMixin, ViewPermissionCheckMixin, ExtraCon
self.request, self.request,
_( _(
'%(object)s created successfully.' '%(object)s created successfully.'
) % {'object': self.get_object_name()} ) % {'object': self.get_object_name(context=context)}
) )
return HttpResponseRedirect(self.get_success_url()) return HttpResponseRedirect(self.get_success_url())

3
mayan/apps/document_indexing/apps.py
View File

@@ -35,8 +35,7 @@ from .links import (
) )
from .permissions import ( from .permissions import (
permission_document_indexing_create, permission_document_indexing_delete, permission_document_indexing_create, permission_document_indexing_delete,
permission_document_indexing_edit, permission_document_indexing_view, permission_document_indexing_edit, permission_document_indexing_view
permission_document_indexing_rebuild
) )
from .widgets import get_instance_link, index_instance_item_link, node_level from .widgets import get_instance_link, index_instance_item_link, node_level

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

@@ -2,13 +2,11 @@ from __future__ import unicode_literals
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from documents.permissions import permission_document_view
from navigation import Link from navigation import Link
from .permissions import ( from .permissions import (
permission_document_indexing_create, permission_document_indexing_edit, permission_document_indexing_create, permission_document_indexing_edit,
permission_document_indexing_delete, permission_document_indexing_rebuild, permission_document_indexing_delete, permission_document_indexing_rebuild,
permission_document_indexing_view
) )

3
mayan/apps/document_indexing/tests/test_views.py
View File

@@ -1,6 +1,5 @@
from __future__ import absolute_import, unicode_literals from __future__ import absolute_import, unicode_literals
from documents.permissions import permission_document_view
from documents.tests.test_views import GenericDocumentViewTestCase from documents.tests.test_views import GenericDocumentViewTestCase
from user_management.tests import ( from user_management.tests import (
TEST_USER_USERNAME, TEST_USER_PASSWORD TEST_USER_USERNAME, TEST_USER_PASSWORD
@@ -9,7 +8,7 @@ from user_management.tests import (
from ..models import Index from ..models import Index
from ..permissions import ( from ..permissions import (
permission_document_indexing_create, permission_document_indexing_delete, permission_document_indexing_create, permission_document_indexing_delete,
permission_document_indexing_edit, permission_document_indexing_view permission_document_indexing_edit
) )
TEST_INDEX_LABEL = 'test label' TEST_INDEX_LABEL = 'test label'

5
mayan/apps/document_indexing/views.py
View File

@@ -3,9 +3,7 @@ from __future__ import absolute_import, unicode_literals
from django.contrib import messages from django.contrib import messages
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse, reverse_lazy from django.core.urlresolvers import reverse, reverse_lazy
from django.http import HttpResponseRedirect from django.shortcuts import get_object_or_404
from django.shortcuts import get_object_or_404, render_to_response
from django.template import RequestContext
from django.utils.html import mark_safe from django.utils.html import mark_safe
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
@@ -147,6 +145,7 @@ class SetupIndexTreeTemplateListView(SingleObjectListView):
'title': _('Tree template nodes for index: %s') % self.get_index(), 'title': _('Tree template nodes for index: %s') % self.get_index(),
} }
class TemplateNodeCreateView(SingleObjectCreateView): class TemplateNodeCreateView(SingleObjectCreateView):
form_class = IndexTemplateNodeForm form_class = IndexTemplateNodeForm
model = IndexTemplateNode model = IndexTemplateNode

1
mayan/apps/document_indexing/widgets.py
View File

@@ -3,7 +3,6 @@ from __future__ import unicode_literals
from django.apps import apps from django.apps import apps
from django.utils.html import mark_safe, escape from django.utils.html import mark_safe, escape
from django.utils.translation import ugettext
def get_instance_link(index_instance_node): def get_instance_link(index_instance_node):