From 3fc4cbe2723d59b9841b3f086fa249918935d117 Mon Sep 17 00:00:00 2001
From: janmax <mail-github@jmx.io>
Date: Fri, 10 Nov 2017 22:32:35 +0100
Subject: [PATCH] Ran isort and fixed some post merging issues
---
backend/core/admin.py | 6 ++----
backend/core/migrations/0002_auto_20171110_1612.py | 2 +-
backend/core/serializers.py | 1 +
backend/core/views.py | 2 --
backend/delbert.py | 13 ++++++++-----
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/backend/core/admin.py b/backend/core/admin.py
index d423e1ba..a2e9f295 100644
--- a/backend/core/admin.py
+++ b/backend/core/admin.py
@@ -1,9 +1,7 @@
-from django import forms
from django.contrib import admin
-from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
-from django.contrib.auth.forms import ReadOnlyPasswordHashField
+from django.contrib.auth.models import Group
-from core.models import (Feedback, Reviewer, Student, Submission,
+from core.models import (ExamType, Feedback, Reviewer, Student, Submission,
SubmissionType, Test, Tutor, UserAccount)
# Stuff we needwant
diff --git a/backend/core/migrations/0002_auto_20171110_1612.py b/backend/core/migrations/0002_auto_20171110_1612.py
index 51ea77b9..d7eba8e7 100644
--- a/backend/core/migrations/0002_auto_20171110_1612.py
+++ b/backend/core/migrations/0002_auto_20171110_1612.py
@@ -4,8 +4,8 @@ from __future__ import unicode_literals
import django.contrib.auth.models
import django.contrib.auth.validators
-from django.db import migrations, models
import django.utils.timezone
+from django.db import migrations, models
class Migration(migrations.Migration):
diff --git a/backend/core/serializers.py b/backend/core/serializers.py
index a5d7967f..8178ecfa 100644
--- a/backend/core/serializers.py
+++ b/backend/core/serializers.py
@@ -2,6 +2,7 @@ from rest_framework import serializers
from core.models import ExamType, Feedback, Student, Submission
+
class ExamSerializer(serializers.ModelSerializer):
class Meta:
diff --git a/backend/core/views.py b/backend/core/views.py
index 17ee5bce..20f185b4 100644
--- a/backend/core/views.py
+++ b/backend/core/views.py
@@ -32,5 +32,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/delbert.py b/backend/delbert.py
index d97add4c..0a478a2d 100644
--- a/backend/delbert.py
+++ b/backend/delbert.py
@@ -1,18 +1,21 @@
import argparse
import csv
+import json
import os
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'grady.settings')
import secrets
import sys
-import json
import django
-django.setup()
-
from django.contrib.auth.models import User
-from core.models import Student, Submission
import util.importer
+from core.models import Student, Submission
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'grady.settings')
+
+django.setup()
+
+
def parseme():
parser = argparse.ArgumentParser()
--
GitLab