Skip to content

Commit

Permalink
dev: run make isort first time
Browse files Browse the repository at this point in the history
  • Loading branch information
maratori committed Sep 17, 2021
1 parent 25adb15 commit 2d5644b
Show file tree
Hide file tree
Showing 62 changed files with 103 additions and 130 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from lona.html import HTML, H1, Table, Tr, Th, Td, THead, TBody, Strong
from lona import LonaApp, LonaView
from lona.html import Strong, THead, TBody, Table, Tr, Th, Td, HTML, H1
from lona import LonaView, LonaApp

from lona_bootstrap_5 import (
SecondaryButton,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from lona.html import HTML, H1, Div, Strong, Button, CLICK
from lona import LonaApp, LonaView
from lona.html import Strong, Button, Div, CLICK, HTML, H1
from lona import LonaView, LonaApp

from lona_chartjs import Chart

Expand Down
4 changes: 2 additions & 2 deletions doc/content/demos/counter/counter.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from lona.html import HTML, H1, Span, NumberInput, Button
from lona import LonaApp, LonaView
from lona.html import NumberInput, Button, Span, HTML, H1
from lona import LonaView, LonaApp

app = LonaApp(__file__)

Expand Down
4 changes: 2 additions & 2 deletions doc/content/demos/daemonized-view/daemonized-view.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import random

from lona.html import HTML, H1, Button
from lona import LonaApp, LonaView
from lona.html import Button, HTML, H1
from lona import LonaView, LonaApp

from lona_chartjs import Chart

Expand Down
4 changes: 2 additions & 2 deletions doc/content/demos/game-of-life/game-of-life.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import numpy

from lona.html import HTML, H1, Div, NumberInput, Button, CLICK, Span
from lona import LonaApp, LonaView
from lona.html import NumberInput, Button, Span, Div, CLICK, HTML, H1
from lona import LonaView, LonaApp

app = LonaApp(__file__)

Expand Down
3 changes: 1 addition & 2 deletions doc/plugins/changelog.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
from flamingo.plugins.rst import register_directive
from docutils.parsers.rst import Directive
from docutils.nodes import raw

from flamingo.plugins.rst import register_directive

GITHUB_RELEASES_BASE_URL = 'https://github.com/lona-web-org/lona/releases/tag/'


Expand Down
10 changes: 4 additions & 6 deletions doc/plugins/pygments.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,15 @@
from tempfile import TemporaryDirectory
import os

from docutils.parsers.rst import Directive, directives
from docutils.nodes import raw

from pygments.styles import get_style_by_name, get_all_styles
from pygments.lexers import get_lexer_by_name, guess_lexer
from pygments.styles import get_all_styles, get_style_by_name
from docutils.parsers.rst import directives, Directive
from flamingo.plugins.rst import register_directive
from pygments.formatters import HtmlFormatter
from pygments.util import ClassNotFound
from pygments.token import Token
from pygments import highlight

from flamingo.plugins.rst import register_directive
from docutils.nodes import raw


def code_block(context):
Expand Down
12 changes: 5 additions & 7 deletions doc/plugins/rst_setting.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
# source: https://github.com/pengutronix/flamingo/blob/master/doc/plugins/rst_setting.py # NOQA: E501

from docutils.parsers.rst import Directive, directives
from docutils.nodes import raw

from pygments.formatters import HtmlFormatter
from pygments.lexers import get_lexer_by_name
from pygments import highlight

from docutils.parsers.rst import directives, Directive
from flamingo.core.utils.imports import acquire
from flamingo.core.utils.pprint import pformat
from pygments.lexers import get_lexer_by_name
from pygments.formatters import HtmlFormatter
from flamingo.plugins.rst import parse_rst
from pygments import highlight
from docutils.nodes import raw

RAW_SETTING_TEMPLATE = """
<div class="raw-setting">
Expand Down
2 changes: 1 addition & 1 deletion doc/plugins/toc_tree.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import re

from jinja2 import Template
from bs4 import BeautifulSoup
from jinja2 import Template

FUNCTION_RE = re.compile(r'\([^)]+\)')

Expand Down
4 changes: 2 additions & 2 deletions lona/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
try:
from .exceptions import * # NOQA: F403
from .routing import Route, MATCH_ALL
from .errors import * # NOQA: F403
from .view import LonaView
from .app import LonaApp
from .exceptions import * # NOQA: F403
from .errors import * # NOQA: F403

except ImportError:
# this happens while packaging and can be ignored
Expand Down
4 changes: 2 additions & 2 deletions lona/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
import logging
import os

from aiohttp.web import Application

from lona.command_line.run_server import run_server
from lona.logging import setup_logging
from lona.settings import Settings
from lona.server import LonaServer
from lona import default_settings
from lona.routing import Route

from aiohttp.web import Application

logger = logging.getLogger('lona.app')


Expand Down
2 changes: 1 addition & 1 deletion lona/client_pre_compiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import logging
import os

from jinja2 import Environment, FileSystemLoader
from jinja2 import FileSystemLoader, Environment

from lona.protocol import ENUMS
from lona._json import dumps
Expand Down
2 changes: 1 addition & 1 deletion lona/command_line/handle_command_line.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from argparse import ArgumentParser, RawTextHelpFormatter
from argparse import RawTextHelpFormatter, ArgumentParser
import logging
import sys
import os
Expand Down
8 changes: 4 additions & 4 deletions lona/command_line/run_server.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import asyncio
import logging
import signal
import asyncio
import socket
import signal
import os

from aiohttp.web import Application, run_app
from aiohttp.web import run_app, Application

from lona.shell.shell import embed_shell, generate_shell_server
from lona.shell.shell import generate_shell_server, embed_shell
from lona.worker_pool import WorkerPool
from lona.logging import setup_logging
from lona.server import LonaServer
Expand Down
2 changes: 1 addition & 1 deletion lona/default_settings.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import os
from typing import List, Dict, Any
import os

MAX_WORKER_THREADS = 4
MAX_STATIC_THREADS = 4
Expand Down
5 changes: 2 additions & 3 deletions lona/html/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
from lona.html.data_binding.select import * # NOQA: F403
from lona.html.data_binding.inputs import * # NOQA: F403
from lona.html.parsing import _setup_node_classes_cache
from lona.html.nodes import * # NOQA: F403
from lona.html.widget import Widget
from lona.html.widgets import HTML
from lona.html.nodes import * # NOQA: F403

from lona.html.parsing import _setup_node_classes_cache

_setup_node_classes_cache()
2 changes: 1 addition & 1 deletion lona/html/attribute_dict.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from lona.protocol import OPERATION, PATCH_TYPE
from lona.protocol import PATCH_TYPE, OPERATION


class AttributeDict:
Expand Down
2 changes: 1 addition & 1 deletion lona/html/attribute_list.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from lona.protocol import OPERATION, PATCH_TYPE
from lona.protocol import PATCH_TYPE, OPERATION


class AttributeList:
Expand Down
2 changes: 1 addition & 1 deletion lona/html/data_binding/inputs.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import Dict, Optional, Any
from typing import Optional, Dict, Any

from lona.events.event_types import CHANGE
from lona.html.node import Node
Expand Down
6 changes: 3 additions & 3 deletions lona/html/node.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
from typing import Union, List, Dict
from textwrap import indent
from typing import List, Dict, Union

from lona.events import EventType, ChangeEventType
from lona.html.attribute_dict import AttributeDict, StyleDict
from lona.html.attribute_list import IDList, ClassList
from lona.html.attribute_list import ClassList, IDList
from lona.html.node_event_list import NodeEventList
from lona.events import ChangeEventType, EventType
from lona.html.abstract_node import AbstractNode
from lona.html.node_list import NodeList
from lona.protocol import NODE_TYPE
Expand Down
2 changes: 1 addition & 1 deletion lona/html/node_list.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from lona.html.abstract_node import AbstractNode
from lona.protocol import OPERATION, PATCH_TYPE
from lona.protocol import PATCH_TYPE, OPERATION
from lona.html.text_node import TextNode


Expand Down
4 changes: 2 additions & 2 deletions lona/html/parsing.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from html.parser import HTMLParser
from typing import Dict, Type
import inspect
from typing import Type, Dict
import logging
import inspect

from lona.html.text_node import TextNode
from lona.html.node import Node
Expand Down
2 changes: 1 addition & 1 deletion lona/html/widget_data.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from copy import deepcopy

from lona.protocol import OPERATION, PATCH_TYPE
from lona.protocol import PATCH_TYPE, OPERATION


def check_value(value):
Expand Down
2 changes: 1 addition & 1 deletion lona/middleware_controller.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import asyncio
import logging
import asyncio

logger = logging.getLogger('lona.middlewares')

Expand Down
2 changes: 1 addition & 1 deletion lona/middlewares/lona_messages.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import logging

from lona.protocol import PROTOCOL, EXIT_CODE, decode_message
from lona.protocol import decode_message, EXIT_CODE, PROTOCOL

logger = logging.getLogger('lona.protocol')

Expand Down
2 changes: 1 addition & 1 deletion lona/middlewares/sessions.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import random
import string
import random

from aiohttp.web import Response

Expand Down
2 changes: 1 addition & 1 deletion lona/protocol.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import Tuple, Optional, Dict, Union
from typing import Optional, Union, Tuple, Dict
from enum import Enum
import json

Expand Down
10 changes: 2 additions & 8 deletions lona/server.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
from functools import reduce
import operator
import asyncio
import logging
import inspect
import asyncio
import os

from aiohttp.web import WebSocketResponse, FileResponse, HTTPFound, Response
from aiohttp import WSMsgType

from aiohttp.web import (
WebSocketResponse,
FileResponse,
HTTPFound,
Response,
)

from lona.view_runtime_controller import ViewRuntimeController
from lona.middleware_controller import MiddlewareController
from lona.client_pre_compiler import ClientPreCompiler
Expand Down
2 changes: 1 addition & 1 deletion lona/shell/commands/lona_routes.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from rlpython.utils.attribute_table import write_attribute_table
from rlpython.utils.argument_parser import ReplArgumentParser
from rlpython.utils.table import write_table
from rlpython.utils.attribute_table import write_attribute_table


class LonaRoutesCommand:
Expand Down
2 changes: 1 addition & 1 deletion lona/static_file_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import logging
import os

from lona.static_files import StaticFile, StyleSheet, Script
from lona.static_files import StyleSheet, StaticFile, Script
from lona.html.abstract_node import AbstractNode
from lona.imports import get_file

Expand Down
2 changes: 1 addition & 1 deletion lona/templating.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import logging
import os

from jinja2 import Environment, FileSystemLoader
from jinja2 import FileSystemLoader, Environment

logger = logging.getLogger('lona.templating')

Expand Down
2 changes: 1 addition & 1 deletion lona/view.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import List, Dict
import threading
import asyncio
from typing import Dict, List

from lona.view_runtime import VIEW_RUNTIME_STATE
from lona.shell.shell import embed_shell
Expand Down
2 changes: 1 addition & 1 deletion lona/view_loader.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import asyncio
import logging
import inspect
import asyncio

from lona.view import LonaView

Expand Down
19 changes: 8 additions & 11 deletions lona/view_runtime.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,6 @@

from yarl import URL

from lona.exceptions import StopReason, ServerStop, UserAbort
from lona.html.abstract_node import AbstractNode
from lona.events.input_event import InputEvent
from lona.unique_ids import generate_unique_id
from lona.imports import get_object_repr
from lona.html.document import Document
from lona.errors import ForbiddenError
from lona.errors import ClientError
from lona.request import Request

from lona.protocol import (
encode_input_event_ack,
encode_http_redirect,
Expand All @@ -27,7 +17,14 @@
encode_data,
DATA_TYPE,
)

from lona.exceptions import StopReason, ServerStop, UserAbort
from lona.errors import ForbiddenError, ClientError
from lona.html.abstract_node import AbstractNode
from lona.unique_ids import generate_unique_id
from lona.events.input_event import InputEvent
from lona.imports import get_object_repr
from lona.html.document import Document
from lona.request import Request

logger = logging.getLogger('lona.view_runtime')
input_events_logger = logging.getLogger('lona.input_events')
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-

from setuptools import setup, find_packages
from setuptools import find_packages, setup

from lona import VERSION_STRING

Expand Down
1 change: 0 additions & 1 deletion test_project/routes.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from lona.routing import Route


routes = [
# view types
Route('/view-types/interactive-view/',
Expand Down
2 changes: 1 addition & 1 deletion test_project/views/crashes/frontend_widget.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from lona.static_files import Script
from lona.html import HTML, Widget
from lona.html import Widget, HTML
from lona.view import LonaView


Expand Down
2 changes: 1 addition & 1 deletion test_project/views/crashes/input_events.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from datetime import datetime

from lona.html import Widget, Button, HTML, Div, Br, H2
from lona.html import Widget, Button, Div, Br, HTML, H2
from lona.view import LonaView


Expand Down

0 comments on commit 2d5644b

Please sign in to comment.