Skip to content

Commit 29b5eb9

Browse files
committed
fixup!: more formatting
1 parent 26f528d commit 29b5eb9

File tree

5 files changed

+35
-26
lines changed

5 files changed

+35
-26
lines changed

kobo/apps/audit_log/models.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@ def create(self, **kwargs):
300300
)
301301

302302
class ProjectHistoryLog(AuditLog):
303+
303304
objects = ProjectHistoryLogManager()
304305

305306
class Meta:
@@ -532,7 +533,9 @@ def qa_change(_, new_field):
532533
return AuditAction.UPDATE_QA, {'qa': {NEW: new_field}}
533534

534535
@staticmethod
535-
def create_from_related_request(request, label, add_action, delete_action, modify_action):
536+
def create_from_related_request(
537+
request, label, add_action, delete_action, modify_action
538+
):
536539
initial_data = getattr(request, 'initial_data', None)
537540
updated_data = getattr(request, 'updated_data', None)
538541
asset_uid = request.resolver_match.kwargs['parent_lookup_asset']
@@ -556,8 +559,5 @@ def create_from_related_request(request, label, add_action, delete_action, modif
556559
else:
557560
action = modify_action
558561
ProjectHistoryLog.objects.create(
559-
user = request.user,
560-
object_id = object_id,
561-
action = action,
562-
metadata = metadata
562+
user=request.user, object_id=object_id, action=action, metadata=metadata
563563
)

kobo/apps/audit_log/tests/test_project_history_logs.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ def _check_common_metadata(self, metadata_dict):
3939
self.assertEqual(metadata_dict['ip_address'], '127.0.0.1')
4040
self.assertEqual(metadata_dict['source'], 'source')
4141

42-
def _base_asset_detail_endpoint_test(self, patch, url_name, request_data, expected_action):
42+
def _base_asset_detail_endpoint_test(
43+
self, patch, url_name, request_data, expected_action
44+
):
4345
url = reverse(url_name, kwargs={'uid': self.asset.uid})
4446
method = self.client.patch if patch else self.client.post
4547
log_metadata = self._base_project_history_log_test(
@@ -478,10 +480,13 @@ def test_modify_service_creates_log(self):
478480
}
479481
log_metadata = self._base_project_history_log_test(
480482
method=self.client.patch,
481-
url=reverse('api_v2:hook-detail', kwargs={
482-
'parent_lookup_asset': self.asset.uid,
483-
'uid': new_hook.uid,
484-
}),
483+
url=reverse(
484+
'api_v2:hook-detail',
485+
kwargs={
486+
'parent_lookup_asset': self.asset.uid,
487+
'uid': new_hook.uid,
488+
},
489+
),
485490
request_data=request_data,
486491
expected_action=AuditAction.MODIFY_SERVICE,
487492
)

kobo/apps/hook/views/v2/hook.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from django.db.models import Q
66
from django.utils import timezone
77
from django.utils.translation import gettext as t
8-
from rest_framework import status, viewsets
8+
from rest_framework import status
99
from rest_framework.decorators import action
1010
from rest_framework.response import Response
1111
from rest_framework_extensions.mixins import NestedViewSetMixin
@@ -19,8 +19,9 @@
1919
from kpi.utils.viewset_mixins import AssetNestedObjectViewsetMixin
2020

2121

22-
class HookViewSet(AssetNestedObjectViewsetMixin, NestedViewSetMixin,
23-
AuditLoggedModelViewSet):
22+
class HookViewSet(
23+
AssetNestedObjectViewsetMixin, NestedViewSetMixin, AuditLoggedModelViewSet
24+
):
2425
"""
2526
2627
## External services

kpi/models/asset_file.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111

1212
from kpi.fields import KpiUidField
1313
from kpi.fields.file import PrivateExtendedFileField
14-
from kpi.interfaces import (
15-
OpenRosaManifestInterface,
16-
SyncBackendMediaInterface,
17-
)
14+
from kpi.interfaces import OpenRosaManifestInterface, SyncBackendMediaInterface
1815
from kpi.models.abstract_models import AbstractTimeStampedModel
1916
from kpi.utils.hash import calculate_hash
2017
from kpi.utils.models import DjangoModelABCMetaclass
@@ -159,9 +156,9 @@ def get_download_url(self, request):
159156
"""
160157
Implements `OpenRosaManifestInterface.get_download_url()`
161158
"""
162-
return drf_reverse('asset-file-content',
163-
args=(self.asset.uid, self.uid),
164-
request=request)
159+
return drf_reverse(
160+
'asset-file-content', args=(self.asset.uid, self.uid), request=request
161+
)
165162

166163
@staticmethod
167164
def get_path(asset, file_type, filename):

kpi/views/v2/asset_file.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# coding: utf-8
2-
from django.http import HttpResponseRedirect, Http404
2+
from django.http import HttpResponseRedirect
33
from private_storage.views import PrivateStorageDetailView
44
from rest_framework.decorators import action
55
from rest_framework_extensions.mixins import NestedViewSetMixin
@@ -8,14 +8,14 @@
88
from kpi.constants import PERM_VIEW_ASSET
99
from kpi.filters import RelatedAssetPermissionsFilter
1010
from kpi.models import AssetFile
11-
from kpi.serializers.v2.asset_file import AssetFileSerializer
1211
from kpi.permissions import AssetEditorPermission
12+
from kpi.serializers.v2.asset_file import AssetFileSerializer
1313
from kpi.utils.viewset_mixins import AssetNestedObjectViewsetMixin
14-
from kpi.views.no_update_model import NoUpdateModelViewSet
1514

1615

17-
class AssetFileViewSet(AssetNestedObjectViewsetMixin, NestedViewSetMixin,
18-
AuditLoggedNoUpdateModelViewSet):
16+
class AssetFileViewSet(
17+
AssetNestedObjectViewsetMixin, NestedViewSetMixin, AuditLoggedNoUpdateModelViewSet
18+
):
1919
"""
2020
This endpoint shows uploaded files related to an asset.
2121
@@ -130,7 +130,13 @@ class AssetFileViewSet(AssetNestedObjectViewsetMixin, NestedViewSetMixin,
130130
serializer_class = AssetFileSerializer
131131
permission_classes = (AssetEditorPermission,)
132132
log_type = 'project-history'
133-
logged_fields = ['uid', 'filename', 'md5_hash', 'download_url', ('object_id', 'asset.id')]
133+
logged_fields = [
134+
'uid',
135+
'filename',
136+
'md5_hash',
137+
'download_url',
138+
('object_id', 'asset.id'),
139+
]
134140

135141
def get_queryset(self):
136142
_queryset = self.model.objects.filter(asset__uid=self.asset_uid)

0 commit comments

Comments
 (0)