Merge pull request alexmojaki#25 from tony/isort

isort: Sort imports

Author: alexmojaki

backend/book/settings.py

@@ -14,9 +14,11 @@
 import sys
 from pathlib import Path
 
+from django.contrib.messages import constants as messages
+
 import birdseye
 import dj_database_url
-from django.contrib.messages import constants as messages
+
 from main.simple_settings import *
 
 BASE_DIR = Path(__file__).parent.parent

backend/book/urls.py

@@ -14,7 +14,8 @@
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.contrib import admin
-from django.urls import path, include
+from django.urls import include, path
+
 import main.urls
 
 urlpatterns = [

backend/book/wsgi.py

@@ -9,8 +9,9 @@
 
 import os
 
-import birdseye.server
 from django.core.wsgi import get_wsgi_application
+
+import birdseye.server
 from werkzeug.middleware.dispatcher import DispatcherMiddleware
 
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'book.settings')

backend/main/chapters/c01_the_shell.py

@@ -1,10 +1,8 @@
 # flake8: NOQA E501
-from main.text import Page, VerbatimStep, MessageStep
-from main.text import Step
+from main.text import MessageStep, Page, Step, VerbatimStep
 
 
 class IntroducingTheShell(Page):
-
     class first_expression(VerbatimStep):
         """
 At the bottom right of the screen is the *shell*. This is a place for running small bits of Python code. Just type in some code, press enter, and it'll run! Try it now:
@@ -49,10 +47,10 @@ class x_to_multiple(MessageStep):
             program = "3 x 4"
 
             def check(self):
-                return 'x' in self.input
+                return "x" in self.input
 
         def check(self):
-            return self.input_matches(r'\d[-*/]\d')
+            return self.input_matches(r"\d[-*/]\d")
 
     final_text = """
 Excellent! Keep experimenting. When you're ready, click 'Next' to continue.

backend/main/chapters/c02_string_basics.py

@@ -1,8 +1,7 @@
 # flake8: NOQA E501
 import ast
 
-from main.text import Page, search_ast, MessageStep
-from main.text import Step, VerbatimStep
+from main.text import MessageStep, Page, Step, VerbatimStep, search_ast
 
 
 class IntroducingStrings(Page):

backend/main/chapters/c03_variables.py

@@ -4,8 +4,7 @@
 
 from astcheck import is_ast_like
 
-from main.text import Page, MessageStep
-from main.text import Step, VerbatimStep
+from main.text import MessageStep, Page, Step, VerbatimStep
 
 
 class IntroducingVariables(Page):

backend/main/chapters/c04_for_loops.py

@@ -2,8 +2,7 @@
 import ast
 from textwrap import dedent
 
-from main.text import Page, MessageStep
-from main.text import Step, ExerciseStep, VerbatimStep
+from main.text import ExerciseStep, MessageStep, Page, Step, VerbatimStep
 from main.utils import returns_stdout
 
 

backend/main/chapters/c05_if_statements.py

@@ -4,8 +4,14 @@
 from abc import ABC
 from textwrap import dedent
 
-from main.text import ExerciseStep, VerbatimStep, MessageStep, Step, search_ast
-from main.text import Page
+from main.text import (
+    ExerciseStep,
+    MessageStep,
+    Page,
+    Step,
+    VerbatimStep,
+    search_ast,
+)
 from main.utils import returns_stdout
 
 

backend/main/chapters/c06_lists.py

@@ -5,7 +5,14 @@
 from typing import List
 
 from main.exercises import generate_list, generate_string
-from main.text import Page, VerbatimStep, ExerciseStep, Step, MessageStep, search_ast
+from main.text import (
+    ExerciseStep,
+    MessageStep,
+    Page,
+    Step,
+    VerbatimStep,
+    search_ast,
+)
 from main.utils import returns_stdout
 
 

backend/main/chapters/c07_nested_loops.py

@@ -2,7 +2,7 @@
 from typing import List
 
 from main.exercises import generate_string
-from main.text import Page, VerbatimStep, ExerciseStep, MessageStep
+from main.text import ExerciseStep, MessageStep, Page, VerbatimStep
 from main.utils import returns_stdout
 
 

backend/main/exercises.py

@@ -3,12 +3,12 @@
 import random
 import string
 import traceback
+import typing
 from textwrap import indent
 
-import typing
 from littleutils import only
 
-from main.utils import returns_stdout, format_exception_string
+from main.utils import format_exception_string, returns_stdout
 
 
 class ExerciseError(Exception):

backend/main/management/__init__.py

@@ -1 +0,0 @@
-

backend/main/migrations/0001_initial.py

@@ -2,8 +2,8 @@
 
 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):

backend/main/migrations/0003_auto_20191117_1916.py

@@ -1,8 +1,8 @@
 # Generated by Django 2.2.7 on 2019-11-17 19:16
 
+import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-import django.db.models.deletion
 
 
 class Migration(migrations.Migration):

backend/main/tests.py

@@ -1,8 +1,9 @@
 import json
 import os
-from pathlib import Path
 import re
-from django.test import TestCase, Client
+from pathlib import Path
+
+from django.test import Client, TestCase
 
 from main.chapters.c05_if_statements import UnderstandingProgramsWithSnoop
 from main.text import pages

backend/main/text.py

@@ -3,20 +3,25 @@
 import ast
 import inspect
 import re
-from abc import abstractmethod, ABC
+from abc import ABC, abstractmethod
 from copy import deepcopy
 from functools import partial
 from importlib import import_module
 from pathlib import Path
-from textwrap import indent, dedent
-from typing import get_type_hints, Union, Type
+from textwrap import dedent, indent
+from typing import Type, Union, get_type_hints
 
 from astcheck import is_ast_like
 from asttokens import ASTTokens
 from littleutils import setattrs
 from markdown import markdown
 
-from main.exercises import check_exercise, check_result, inputs_string, generate_for_type
+from main.exercises import (
+    check_exercise,
+    check_result,
+    generate_for_type,
+    inputs_string,
+)
 from main.utils import no_weird_whitespace, snake, unwrapped_markdown
 
 

backend/main/urls.py

@@ -18,7 +18,7 @@
 from django.views.generic import TemplateView
 
 from main.text import chapters
-from main.views import api_view, FrontendAppView, HomePageView
+from main.views import FrontendAppView, HomePageView, api_view
 
 home_view = HomePageView.as_view()
 urlpatterns = [

backend/main/utils/__init__.py

@@ -8,7 +8,7 @@
 from io import StringIO
 
 import stack_data
-from littleutils import withattrs, strip_required_prefix, strip_required_suffix
+from littleutils import strip_required_prefix, strip_required_suffix, withattrs
 from markdown import markdown
 from pygments.formatters import HtmlFormatter
 from pygments.lexers import get_lexer_by_name

backend/main/utils/django.py

@@ -1,6 +1,7 @@
-from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Layout, Field
 from django import forms
+
+from crispy_forms.helper import FormHelper
+from crispy_forms.layout import Field, Layout
 from littleutils import setattrs
 
 

backend/main/views.py

@@ -5,19 +5,20 @@
 from io import StringIO
 from pathlib import Path
 from random import shuffle
-from tokenize import generate_tokens, Untokenizer
-from typing import get_type_hints, Type
+from tokenize import Untokenizer, generate_tokens
+from typing import Type, get_type_hints
 from uuid import uuid4
 
-import requests
-from birdseye import eye
 from django.conf import settings
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.messages.views import SuccessMessageMixin
 from django.forms import ModelForm
-from django.http import JsonResponse, HttpResponse
+from django.http import HttpResponse, JsonResponse
 from django.views import View
 from django.views.generic import CreateView
+
+import requests
+from birdseye import eye
 from django_user_agents.utils import get_user_agent
 from littleutils import select_attrs
 from markdown import markdown
@@ -27,7 +28,7 @@
 from main.chapters.c05_if_statements import UnderstandingProgramsWithSnoop
 from main.chapters.c06_lists import UnderstandingProgramsWithPythonTutor
 from main.models import CodeEntry, ListEmail
-from main.text import Page, page_slugs_list, pages, ExerciseStep, clean_program
+from main.text import ExerciseStep, Page, clean_program, page_slugs_list, pages
 from main.utils.django import PlaceHolderForm
 from main.workers.master import worker_result
 

backend/main/workers/birdseye.py

@@ -4,6 +4,7 @@
 from birdseye.bird import BirdsEye
 
 from main.utils import rows_to_dicts
+
 from .worker import console, execute
 
 birdseye.bird.get_unfrozen_datetime = datetime.now

backend/main/workers/master.py

@@ -4,7 +4,7 @@
 import queue
 from collections import defaultdict, deque
 from functools import lru_cache
-from multiprocessing import Queue, Process
+from multiprocessing import Process, Queue
 from threading import Thread
 from time import sleep, time
 

backend/main/workers/snoop.py

@@ -5,8 +5,8 @@
 import snoop.formatting
 import snoop.tracer
 
-from .worker import execute
 from ..utils import internal_dir
+from .worker import execute
 
 snoop.tracer.internal_directories += (internal_dir,)
 

backend/main/workers/worker.py

@@ -10,7 +10,11 @@
 from main.text import pages
 from main.utils import print_exception
 from main.workers.limits import set_limits
-from main.workers.utils import internal_error_result, make_result, output_buffer
+from main.workers.utils import (
+    internal_error_result,
+    make_result,
+    output_buffer,
+)
 
 log = logging.getLogger(__name__)
 

setup.cfg

@@ -4,3 +4,15 @@ exclude = .*/,
 	*.egg,
 	backend/*/migrations
 max-line-length = 88
+
+[isort]
+combine_as_imports= true
+default_section = THIRDPARTY
+include_trailing_comma = true
+multi_line_output = 3
+known_django = django
+known_first_party = main
+split_before_closing_bracket = true
+sections = FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
+line_length = 88
+not_skip = __init__.py