Skip to content

Commit a3307f7

Browse files
committed
Fix sorting and pep8 issues
1 parent ff0d1ef commit a3307f7

File tree

10 files changed

+27
-36
lines changed

10 files changed

+27
-36
lines changed

django_school/classroom/forms.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
from django import forms
2-
from django.db import transaction
32
from django.contrib.auth.forms import UserCreationForm
3+
from django.db import transaction
44
from django.forms.utils import ValidationError
55

6-
from classroom.models import Answer, User, Student, Subject, Question, StudentAnswer
6+
from classroom.models import (Answer, Question, Student, StudentAnswer,
7+
Subject, User)
78

89

910
class TeacherSignUpForm(UserCreationForm):

django_school/classroom/migrations/0001_initial.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Generated by Django 2.0.1 on 2018-01-18 18:07
22

3-
from django.conf import settings
43
import django.contrib.auth.models
54
import django.contrib.auth.validators
6-
from django.db import migrations, models
75
import django.db.models.deletion
86
import django.utils.timezone
7+
from django.conf import settings
8+
from django.db import migrations, models
99

1010

1111
class Migration(migrations.Migration):

django_school/classroom/models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
from django.db import models
21
from django.contrib.auth.models import AbstractUser
3-
from django.utils.html import mark_safe, escape
2+
from django.db import models
3+
from django.utils.html import escape, mark_safe
44

55

66
class User(AbstractUser):

django_school/classroom/tests.py

Lines changed: 0 additions & 3 deletions
This file was deleted.

django_school/classroom/urls.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
from django.contrib import admin
2-
from django.urls import path, include
1+
from django.urls import include, path
32

43
from .views import classroom, students, teachers
54

6-
75
urlpatterns = [
86
path('', classroom.home, name='home'),
97

django_school/classroom/views/classroom.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from django.shortcuts import render, redirect
1+
from django.shortcuts import redirect, render
22
from django.views.generic import TemplateView
33

44

django_school/classroom/views/students.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
from django.views.generic import CreateView, ListView, View
2-
from django.contrib.auth.decorators import login_required
3-
from django.utils.decorators import method_decorator
4-
from django.shortcuts import redirect, render, get_object_or_404
5-
from django.contrib.auth import login
6-
from django.db.models import Count
71
from django.contrib import messages
2+
from django.contrib.auth import login
3+
from django.contrib.auth.decorators import login_required
84
from django.db import transaction
5+
from django.db.models import Count
6+
from django.shortcuts import get_object_or_404, redirect, render
7+
from django.utils.decorators import method_decorator
8+
from django.views.generic import CreateView, ListView
99

1010
from ..decorators import student_required
11-
from ..models import Quiz, User, TakenQuiz
1211
from ..forms import StudentSignUpForm, TakeQuizForm
12+
from ..models import Quiz, TakenQuiz, User
1313

1414

1515
class StudentSignUpView(CreateView):

django_school/classroom/views/teachers.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
1-
from django.views.generic import CreateView, UpdateView, DetailView
2-
from django.views.generic.base import View
3-
from django.contrib.auth.decorators import login_required
4-
from django.views.generic import ListView
5-
from django.utils.decorators import method_decorator
1+
from django.contrib import messages
62
from django.contrib.auth import login
7-
from django.shortcuts import render, redirect, get_object_or_404
8-
from django.urls import reverse, reverse_lazy
3+
from django.contrib.auth.decorators import login_required
94
from django.db import transaction
10-
from django.db.models import Count, Avg
11-
from django.contrib import messages
5+
from django.db.models import Avg, Count
126
from django.forms import inlineformset_factory
7+
from django.shortcuts import get_object_or_404, redirect, render
8+
from django.urls import reverse
9+
from django.utils.decorators import method_decorator
10+
from django.views.generic import CreateView, DetailView, ListView, UpdateView
1311

1412
from ..decorators import teacher_required
15-
from ..models import User, Quiz, Question, Answer
16-
from ..forms import TeacherSignUpForm, QuestionForm, BaseAnswerInlineFormSet
13+
from ..forms import BaseAnswerInlineFormSet, QuestionForm, TeacherSignUpForm
14+
from ..models import Answer, Question, Quiz, User
1715

1816

1917
class TeacherSignUpView(CreateView):
@@ -169,4 +167,4 @@ def question_change(request, quiz_pk, question_pk):
169167
'question': question,
170168
'form': form,
171169
'formset': formset
172-
})
170+
})

django_school/django_school/settings.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
# Application definition
3434

3535
INSTALLED_APPS = [
36-
'django.contrib.admin',
3736
'django.contrib.auth',
3837
'django.contrib.contenttypes',
3938
'django.contrib.sessions',
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
from django.contrib import admin
2-
from django.urls import path, include
1+
from django.urls import include, path
32

43
from classroom.views import classroom, students, teachers
54

@@ -9,5 +8,4 @@
98
path('accounts/signup/', classroom.SignUpView.as_view(), name='signup'),
109
path('accounts/signup/student/', students.StudentSignUpView.as_view(), name='student_signup'),
1110
path('accounts/signup/teacher/', teachers.TeacherSignUpView.as_view(), name='teacher_signup'),
12-
path('admin/', admin.site.urls),
1311
]

0 commit comments

Comments
 (0)