From 298a899e792ebd0cd82a5f01b613c31f19082e51 Mon Sep 17 00:00:00 2001 From: Simon Willison Date: Wed, 12 Feb 2020 22:05:46 -0800 Subject: [PATCH] Reformatted with black --- datasette/utils/__init__.py | 4 +++- datasette/views/base.py | 24 ++++++++++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/datasette/utils/__init__.py b/datasette/utils/__init__.py index 799fc3f568..facbc4de49 100644 --- a/datasette/utils/__init__.py +++ b/datasette/utils/__init__.py @@ -174,7 +174,9 @@ class InvalidSql(Exception): def validate_sql_select(sql): - sql = "\n".join(line for line in sql.split('\n') if not line.strip().startswith('--')) + sql = "\n".join( + line for line in sql.split("\n") if not line.strip().startswith("--") + ) sql = sql.strip().lower() if not any(r.match(sql) for r in allowed_sql_res): raise InvalidSql("Statement must be a SELECT") diff --git a/datasette/views/base.py b/datasette/views/base.py index 673e6d7e3f..3a958d8811 100644 --- a/datasette/views/base.py +++ b/datasette/views/base.py @@ -75,21 +75,25 @@ def database_color(self, database): async def render(self, templates, request, context): template = self.ds.jinja_env.select_template(templates) template_context = { - **context, - **{ - "database_url": self.database_url, - "database_color": self.database_color, - }, - } - if request and request.args.get("_context") and self.ds.config("template_debug"): + **context, + **{ + "database_url": self.database_url, + "database_color": self.database_color, + }, + } + if ( + request + and request.args.get("_context") + and self.ds.config("template_debug") + ): return Response.html( "
{}
".format( jinja2.escape(json.dumps(template_context, default=repr, indent=4)) ) ) - return Response.html(await self.ds.render_template( - template, template_context, request=request - )) + return Response.html( + await self.ds.render_template(template, template_context, request=request) + ) class DataView(BaseView):