Skip to content

Commit 9ca3918

Browse files
committed
PEPify
1 parent c9990fa commit 9ca3918

File tree

4 files changed

+25
-13
lines changed

4 files changed

+25
-13
lines changed

ennead/app.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,10 @@ def create_app(config_path: Optional[str] = None) -> Flask:
6363
app.add_url_rule('/login', 'login_page', login_page)
6464
app.add_url_rule('/login', 'login', login, methods=['POST'])
6565
app.add_url_rule('/logout', 'logout', logout)
66-
66+
6767
app.add_url_rule('/thread/<int:task_id>/<int:student_id>', 'thread', thread_page)
68-
app.add_url_rule('/thread/<int:task_id>/<int:student_id>', 'post_to_thread', post_to_thread, methods=['POST'])
68+
app.add_url_rule('/thread/<int:task_id>/<int:student_id>',
69+
'post_to_thread', post_to_thread, methods=['POST'])
6970

7071
app.add_url_rule('/adm/tasks', 'adm_task_list_page', adm_task_list_page)
7172
app.add_url_rule('/adm/tasks/<int:task_id>', 'task_edit_page', task_edit_page)

ennead/models/thread.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
import datetime
44
from typing import List
55

6-
from peewee import DateTimeField, IntegerField, DecimalField, TextField, BooleanField, ForeignKeyField
6+
from peewee import DateTimeField, DecimalField, TextField, BooleanField, ForeignKeyField
77

88
from ennead.models.user import User
99
from ennead.models.task import Task
1010
from ennead.models.base import BaseModel
1111

1212
from ennead.utils import render_markdown
1313

14+
1415
class Thread(BaseModel):
1516
"""Student-with-teachers chat about `Task`
1617
@@ -33,7 +34,6 @@ def ordered_posts(self, show_hidden=False):
3334
posts = filter(lambda post: not post.hide_from_student, posts)
3435
posts = sorted(posts, key=lambda post: post.date)
3536
return posts
36-
3737

3838

3939
class Post(BaseModel):

ennead/utils/__init__.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99
from ennead.utils.markdown import render_markdown
1010

1111

12-
__all__ = ['require_logged_in', 'require_not_logged_in', 'require_teacher', 'require_student', 'render_markdown']
12+
__all__ = [
13+
'require_logged_in', 'require_not_logged_in',
14+
'require_teacher', 'require_student',
15+
'render_markdown',
16+
]
1317

1418

1519
def require_logged_in(func: Callable) -> Callable:
@@ -23,6 +27,7 @@ def wrapped(*args: Any, **kwargs: Any) -> Response:
2327

2428
return wrapped
2529

30+
2631
def require_not_logged_in(func: Callable) -> Callable:
2732
"""Make endpoint require NOT logged in user"""
2833

@@ -47,6 +52,7 @@ def wrapped(*args: Any, **kwargs: Any) -> Response:
4752

4853
return wrapped
4954

55+
5056
def require_student(func: Callable) -> Callable:
5157
"""Make endpoint require logged in student"""
5258

ennead/views/dialogue.py

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,30 @@
33
import datetime
44
from flask import g
55

6-
from flask import session, current_app, render_template, request, redirect, url_for
6+
from flask import render_template, request, redirect, url_for
77
from werkzeug.wrappers import Response
88

9-
from ennead.utils import require_logged_in, require_teacher, require_student
10-
from ennead.utils import render_markdown
11-
from ennead.models.user import User, UserGroup
9+
from ennead.utils import require_logged_in
10+
from ennead.models.user import User
1211
from ennead.models.task import Task
1312
from ennead.models.thread import Thread, Post
1413

14+
1515
def has_access_to_thread(student_id):
1616
return g.user.is_teacher or (g.user.is_student and (g.user.id == student_id))
1717

18+
1819
def get_thread(task_id, student_id):
1920
task = Task.get_by_id(task_id)
2021
student = User.get_by_id(student_id)
2122
thread, _ = Thread.get_or_create(task=task, student=student)
2223
return thread
2324

25+
2426
def correct_message(text):
2527
return (len(text) != 0)
2628

29+
2730
@require_logged_in
2831
def thread_page(task_id: int, student_id: int) -> Response:
2932
"""GET /thread/{task}/{student}: show specified thread"""
@@ -32,7 +35,9 @@ def thread_page(task_id: int, student_id: int) -> Response:
3235
return redirect(url_for('index'))
3336
thread = get_thread(task_id, student_id)
3437
posts = thread.ordered_posts(show_hidden=g.user.is_teacher)
35-
return render_template('dialogue.html', thread=thread, task=thread.task, student=thread.student, posts=posts)
38+
return render_template('dialogue.html', thread=thread, task=thread.task,
39+
student=thread.student, posts=posts)
40+
3641

3742
@require_logged_in
3843
def post_to_thread(task_id: int, student_id: int) -> Response:
@@ -51,9 +56,9 @@ def post_to_thread(task_id: int, student_id: int) -> Response:
5156
if thread.score != score:
5257
thread.update(score=score).execute()
5358

54-
post = Post.create(text=text, date=datetime.datetime.now(),
55-
author=g.user, thread=thread,
56-
hide_from_student=hide_from_student)
59+
Post.create(text=text, date=datetime.datetime.now(),
60+
author=g.user, thread=thread,
61+
hide_from_student=hide_from_student)
5762
else:
5863
# TODO: redirect back to a dialogue, restoring a message draft not to lose it
5964
pass

0 commit comments

Comments
 (0)