From 673686af539c026d40c09501f6b531425964c3e6 Mon Sep 17 00:00:00 2001
From: janmax <mail-github@jmx.io>
Date: Thu, 9 Nov 2017 17:05:30 +0100
Subject: [PATCH] Reorderd imports in compliance with isort rules
---
backend/core/migrations/0001_initial.py | 5 +++--
backend/core/models.py | 2 +-
backend/core/serializers.py | 3 ++-
backend/core/tests.py | 3 ++-
backend/core/urls.py | 2 --
backend/core/views/api.py | 6 +++---
backend/grady/settings/default.py | 3 +--
backend/util/importer.py | 5 +++--
8 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/backend/core/migrations/0001_initial.py b/backend/core/migrations/0001_initial.py
index 8f531591..39b10c6d 100644
--- a/backend/core/migrations/0001_initial.py
+++ b/backend/core/migrations/0001_initial.py
@@ -2,10 +2,11 @@
# Generated by Django 1.11.7 on 2017-11-04 19:10
from __future__ import unicode_literals
-import core.models
+import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
-import django.db.models.deletion
+
+import core.models
class Migration(migrations.Migration):
diff --git a/backend/core/models.py b/backend/core/models.py
index 01218655..3124992c 100644
--- a/backend/core/models.py
+++ b/backend/core/models.py
@@ -10,8 +10,8 @@ from collections import OrderedDict
from random import randrange, sample
from string import ascii_lowercase
-from django.contrib.auth.models import AbstractBaseUser, BaseUserManager
from django.contrib.auth import get_user_model
+from django.contrib.auth.models import AbstractBaseUser, BaseUserManager
from django.db import models
from django.db.models import Value as V
from django.db.models import (BooleanField, Case, Count, F, IntegerField, Q,
diff --git a/backend/core/serializers.py b/backend/core/serializers.py
index 6ccd3c49..b8f2e56f 100644
--- a/backend/core/serializers.py
+++ b/backend/core/serializers.py
@@ -1,5 +1,6 @@
from rest_framework import serializers
-from core.models import Student, Submission, Feedback, ExamType
+
+from core.models import ExamType, Feedback, Student, Submission
class ExamSerializer(serializers.ModelSerializer):
diff --git a/backend/core/tests.py b/backend/core/tests.py
index d9db4611..9447b624 100644
--- a/backend/core/tests.py
+++ b/backend/core/tests.py
@@ -1,6 +1,7 @@
from django.test import TestCase
-from core.models import Submission, SubmissionType, Feedback, Student, Tutor, Reviewer
+from core.models import (Feedback, Reviewer, Student, Submission,
+ SubmissionType, Tutor)
from util.importer import GradyUserFactory
diff --git a/backend/core/urls.py b/backend/core/urls.py
index 6ce62b41..539e3183 100644
--- a/backend/core/urls.py
+++ b/backend/core/urls.py
@@ -4,8 +4,6 @@ from rest_framework_jwt.views import obtain_jwt_token
from core import views
-
-
urlpatterns = [
url(r'^$', views.IndexView.as_view(), name='index'),
url(r'^login/$', views.Login.as_view(), name='login'),
diff --git a/backend/core/views/api.py b/backend/core/views/api.py
index 5ab7f1ef..3f015b44 100644
--- a/backend/core/views/api.py
+++ b/backend/core/views/api.py
@@ -1,6 +1,8 @@
-from core.serializers import SubmissionSerializer, StudentSerializer, FeedbackSerializer
from rest_framework.generics import RetrieveAPIView
+
from core.permissions import IsStudent
+from core.serializers import (FeedbackSerializer, StudentSerializer,
+ SubmissionSerializer)
class StudentApiView(RetrieveAPIView):
@@ -25,5 +27,3 @@ class FeedbackApiView(RetrieveAPIView):
def get_queryset(self):
return [submission.feedback for submission in self.request.user.submissions]
serializer_class = FeedbackSerializer
-
-
diff --git a/backend/grady/settings/default.py b/backend/grady/settings/default.py
index 29513984..deacf96f 100644
--- a/backend/grady/settings/default.py
+++ b/backend/grady/settings/default.py
@@ -10,8 +10,8 @@ For the full list of settings and their values, see
https://docs.djangoproject.com/en/1.10/ref/settings/
"""
-import os
import datetime
+import os
from django.contrib.messages import constants as messages
@@ -159,4 +159,3 @@ REST_FRAMEWORK = {
JWT_AUTH = {
'JWT_EXPIRATION_DELTA': datetime.timedelta(seconds=600),
}
-
diff --git a/backend/util/importer.py b/backend/util/importer.py
index 5c792deb..299f4ae5 100644
--- a/backend/util/importer.py
+++ b/backend/util/importer.py
@@ -8,8 +8,9 @@ from typing import Callable
import util.convert
import util.processing
-from core.models import (ExamType, Feedback, Student, Tutor, Reviewer, Submission,
- SubmissionType, Test, UserAccount as User)
+from core.models import UserAccount as User
+from core.models import (ExamType, Feedback, Reviewer, Student, Submission,
+ SubmissionType, Test, Tutor)
from util.messages import info, warn
from util.processing import EmptyTest
--
GitLab