From cf1fe693e5741035df65cc9d69c4af32befd021d Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Sun, 13 May 2018 09:58:28 -0300 Subject: [PATCH] Used isort to re-order my imports --- .isort.cfg | 3 +++ datasette/app.py | 43 +++++++++++++++++++++---------------- datasette/views/base.py | 20 +++++++++-------- datasette/views/database.py | 9 +++++--- datasette/views/index.py | 7 ++++-- datasette/views/table.py | 15 +++++++------ 6 files changed, 59 insertions(+), 38 deletions(-) create mode 100644 .isort.cfg diff --git a/.isort.cfg b/.isort.cfg new file mode 100644 index 00000000..0cece53b --- /dev/null +++ b/.isort.cfg @@ -0,0 +1,3 @@ +[settings] +multi_line_output=3 + diff --git a/datasette/app.py b/datasette/app.py index a3e070e9..4105ba3a 100644 --- a/datasette/app.py +++ b/datasette/app.py @@ -1,33 +1,40 @@ -from sanic import Sanic -from sanic import response -from sanic.exceptions import NotFound, InvalidUsage -from datasette.views.base import RenderMixin, DatasetteError, ureg, HASH_BLOCK_SIZE -from datasette.views.index import IndexView -from datasette.views.database import DatabaseView, DatabaseDownload -from datasette.views.table import TableView, RowView -from jinja2 import Environment, FileSystemLoader, ChoiceLoader, PrefixLoader -import sqlite3 -from pathlib import Path -from concurrent import futures -import os -import urllib.parse +import hashlib import itertools import json -import hashlib +import os +import sqlite3 import sys -import pluggy import traceback +import urllib.parse +from concurrent import futures +from pathlib import Path + +import pluggy +from jinja2 import ChoiceLoader, Environment, FileSystemLoader, PrefixLoader +from sanic import Sanic, response +from sanic.exceptions import InvalidUsage, NotFound + +from datasette.views.base import ( + HASH_BLOCK_SIZE, + DatasetteError, + RenderMixin, + ureg +) +from datasette.views.database import DatabaseDownload, DatabaseView +from datasette.views.index import IndexView +from datasette.views.table import RowView, TableView + +from . import hookspecs from .utils import ( detect_fts, + detect_spatialite, escape_css_string, escape_sqlite, - detect_spatialite, get_all_foreign_keys, get_plugins, module_from_path, - to_css_class, + to_css_class ) -from . import hookspecs from .version import __version__ app_root = Path(__file__).parent.parent diff --git a/datasette/views/base.py b/datasette/views/base.py index 33b2438f..64a46808 100644 --- a/datasette/views/base.py +++ b/datasette/views/base.py @@ -1,6 +1,15 @@ -from sanic.views import HTTPMethodView +import asyncio +import json +import re +import sqlite3 +import threading +import time + +import pint from sanic import response from sanic.exceptions import NotFound +from sanic.views import HTTPMethodView + from datasette import __version__ from datasette.utils import ( CustomJSONEncoder, @@ -9,15 +18,8 @@ from datasette.utils import ( path_with_added_args, path_with_ext, sqlite_timelimit, - to_css_class, + to_css_class ) -import re -import threading -import sqlite3 -import asyncio -import time -import json -import pint connections = threading.local() ureg = pint.UnitRegistry() diff --git a/datasette/views/database.py b/datasette/views/database.py index a4f578aa..3ccd7ef0 100644 --- a/datasette/views/database.py +++ b/datasette/views/database.py @@ -1,8 +1,11 @@ -from .base import BaseView -from datasette.utils import validate_sql_select, to_css_class -from sanic import response import os +from sanic import response + +from datasette.utils import to_css_class, validate_sql_select + +from .base import BaseView + class DatabaseView(BaseView): diff --git a/datasette/views/index.py b/datasette/views/index.py index 2d5a3e07..c4ed3bef 100644 --- a/datasette/views/index.py +++ b/datasette/views/index.py @@ -1,8 +1,11 @@ -from .base import RenderMixin, HASH_LENGTH +import json + from sanic import response + from datasette.utils import CustomJSONEncoder from datasette.version import __version__ -import json + +from .base import HASH_LENGTH, RenderMixin class IndexView(RenderMixin): diff --git a/datasette/views/table.py b/datasette/views/table.py index b8b8551a..5369825c 100644 --- a/datasette/views/table.py +++ b/datasette/views/table.py @@ -1,6 +1,10 @@ -from sanic.request import RequestParameters -from .base import BaseView, DatasetteError, ureg +import sqlite3 +import urllib + +import jinja2 from sanic.exceptions import NotFound +from sanic.request import RequestParameters + from datasette.utils import ( Filters, compound_keys_after_sql, @@ -10,11 +14,10 @@ from datasette.utils import ( path_from_row_pks, path_with_added_args, to_css_class, - urlsafe_components, + urlsafe_components ) -import sqlite3 -import jinja2 -import urllib + +from .base import BaseView, DatasetteError, ureg class RowTableShared(BaseView):