github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update to latest black (#609)

Browse source
This commit is contained in:
Simon Willison 2019-10-30 11:49:01 -07:00 • committed by GitHub
commit 5dd4d2b2d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
datasette/views/base.py
View file

@ -257,9 +257,12 @@ class DataView(BaseView):
assert NotImplemented assert NotImplemented
async def get(self, request, db_name, **kwargs): async def get(self, request, db_name, **kwargs):
database, hash, correct_hash_provided, should_redirect = await self.resolve_db_name( (
request, db_name, **kwargs database,
) hash,
correct_hash_provided,
should_redirect,
) = await self.resolve_db_name(request, db_name, **kwargs)
if should_redirect: if should_redirect:
return self.redirect(request, should_redirect, remove_args={"_hash"}) return self.redirect(request, should_redirect, remove_args={"_hash"})

7
datasette/views/table.py
View file

@ -586,9 +586,10 @@ class TableView(RowTableShared):
) )
for facet in facet_instances: for facet in facet_instances:
instance_facet_results, instance_facets_timed_out = ( (
await facet.facet_results() instance_facet_results,
) instance_facets_timed_out,
) = await facet.facet_results()
facet_results.update(instance_facet_results) facet_results.update(instance_facet_results)
facets_timed_out.extend(instance_facets_timed_out) facets_timed_out.extend(instance_facets_timed_out)

2
setup.py
View file

@ -25,7 +25,7 @@ def get_version():
# Only install black on Python 3.6 or higher # Only install black on Python 3.6 or higher
maybe_black = [] maybe_black = []
if sys.version_info > (3, 6): if sys.version_info > (3, 6):
maybe_black = ["black"] maybe_black = ["black~=19.10b0"]
setup( setup(
name="datasette", name="datasette",

2
tests/test_api.py
View file

@ -1245,7 +1245,7 @@ def test_config_json(app_client):
def test_page_size_matching_max_returned_rows( def test_page_size_matching_max_returned_rows(
app_client_returned_rows_matches_page_size app_client_returned_rows_matches_page_size,
): ):
fetched = [] fetched = []
path = "/fixtures/no_primary_key.json" path = "/fixtures/no_primary_key.json"