Skip to content

Commit 35c5ffa

Browse files
code quality updates
1 parent 52cdf9e commit 35c5ffa

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

app/api/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from django.db import models
44
from django.dispatch import receiver
5-
from django.db.models.signals import post_save, pre_save, pre_delete
5+
from django.db.models.signals import post_save, pre_delete
66
from django.urls import reverse
77
from django.conf import settings
88
from django.contrib.auth.models import User

app/api/permissions.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99

1010
class ProjectMixin:
11+
@classmethod
1112
def get_project_id(self, request, view):
1213
return view.kwargs.get('project_id') or request.query_params.get('project_id')
1314

app/api/tests/test_api.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def create_default_roles():
2121

2222

2323
def assign_user_to_role(project_member, project, role_name):
24-
role, created = Role.objects.get_or_create(name=role_name)
24+
role, _ = Role.objects.get_or_create(name=role_name)
2525
RoleMapping.objects.get_or_create(role_id=role.id, user_id=project_member.id, project_id=project.id)
2626

2727

@@ -49,9 +49,9 @@ def setUpTestData(cls):
4949
password=cls.sub_project_member_pass)
5050
approver = User.objects.create_user(username=cls.approver_name,
5151
password=cls.approver_pass)
52-
project_admin = User.objects.create_superuser(username=cls.super_user_name,
53-
password=cls.super_user_pass,
54-
52+
User.objects.create_superuser(username=cls.super_user_name,
53+
password=cls.super_user_pass,
54+
5555
cls.main_project = mommy.make('TextClassificationProject', users=[main_project_member])
5656
cls.sub_project = mommy.make('TextClassificationProject', users=[sub_project_member])
5757
assign_user_to_role(project_member=main_project_member, project=cls.main_project,
@@ -301,8 +301,7 @@ def setUpTestData(cls):
301301
create_default_roles()
302302
project_member = User.objects.create_user(username=cls.project_member_name,
303303
password=cls.project_member_pass)
304-
non_project_member = User.objects.create_user(username=cls.non_project_member_name,
305-
password=cls.non_project_member_pass)
304+
User.objects.create_user(username=cls.non_project_member_name, password=cls.non_project_member_pass)
306305
# Todo: change super_user to project_admin.
307306
super_user = User.objects.create_superuser(username=cls.super_user_name,
308307
password=cls.super_user_pass,
@@ -1415,7 +1414,7 @@ def setUpTestData(cls):
14151414
cls.other_project = mommy.make('Project', users=[cls.second_project_member, project_admin])
14161415
cls.admin_role = Role.objects.get(name=settings.ROLE_PROJECT_ADMIN)
14171416
cls.role = mommy.make('Role', name='otherrole')
1418-
rolemapping = mommy.make('RoleMapping', role=cls.admin_role, project=cls.main_project, user=project_admin)
1417+
mommy.make('RoleMapping', role=cls.admin_role, project=cls.main_project, user=project_admin)
14191418
cls.data = {'user': project_member.id, 'role': cls.admin_role.id, 'project': cls.main_project.id}
14201419
cls.other_url = reverse(viewname='rolemapping_list', args=[cls.other_project.id])
14211420
cls.url = reverse(viewname='rolemapping_list', args=[cls.main_project.id])
@@ -1460,8 +1459,7 @@ def setUpTestData(cls):
14601459
password=cls.project_admin_pass)
14611460
project_member = User.objects.create_user(username=cls.project_member_name,
14621461
password=cls.project_member_pass)
1463-
non_project_member = User.objects.create_user(username=cls.non_project_member_name,
1464-
password=cls.non_project_member_pass)
1462+
User.objects.create_user(username=cls.non_project_member_name, password=cls.non_project_member_pass)
14651463
project = mommy.make('Project', users=[project_admin, project_member])
14661464
admin_role = Role.objects.get(name=settings.ROLE_PROJECT_ADMIN)
14671465
annotator_role = Role.objects.get(name=settings.ROLE_ANNOTATOR)

0 commit comments

Comments
 (0)