chore: Embrace the walrus operator (#24127)

This commit is contained in:
John Bodley
2023-05-19 00:37:13 -07:00
committed by GitHub
parent 6b5459121f
commit d583ca9ef5
54 changed files with 100 additions and 185 deletions

View File

@@ -67,8 +67,7 @@ class PandasDataLoader(DataLoader):
return inspect(self._db_engine).default_schema_name
def _take_data_types(self, table: Table) -> Optional[Dict[str, str]]:
metadata_table = table.table_metadata
if metadata_table:
if metadata_table := table.table_metadata:
types = metadata_table.types
if types:
return types

View File

@@ -136,7 +136,6 @@ def upload_csv(
dtype: Union[str, None] = None,
):
csv_upload_db_id = get_upload_db().id
schema = utils.get_example_default_schema()
form_data = {
"csv_file": open(filename, "rb"),
"delimiter": ",",
@@ -146,7 +145,7 @@ def upload_csv(
"index_label": "test_label",
"overwrite_duplicate": False,
}
if schema:
if schema := utils.get_example_default_schema():
form_data["schema"] = schema
if extra:
form_data.update(extra)
@@ -159,7 +158,6 @@ def upload_excel(
filename: str, table_name: str, extra: Optional[Dict[str, str]] = None
):
excel_upload_db_id = get_upload_db().id
schema = utils.get_example_default_schema()
form_data = {
"excel_file": open(filename, "rb"),
"name": table_name,
@@ -169,7 +167,7 @@ def upload_excel(
"index_label": "test_label",
"mangle_dupe_cols": False,
}
if schema:
if schema := utils.get_example_default_schema():
form_data["schema"] = schema
if extra:
form_data.update(extra)
@@ -180,7 +178,6 @@ def upload_columnar(
filename: str, table_name: str, extra: Optional[Dict[str, str]] = None
):
columnar_upload_db_id = get_upload_db().id
schema = utils.get_example_default_schema()
form_data = {
"columnar_file": open(filename, "rb"),
"name": table_name,
@@ -188,7 +185,7 @@ def upload_columnar(
"if_exists": "fail",
"index_label": "test_label",
}
if schema:
if schema := utils.get_example_default_schema():
form_data["schema"] = schema
if extra:
form_data.update(extra)

View File

@@ -641,14 +641,13 @@ class TestDatasetApi(SupersetTestCase):
if backend() == "sqlite":
return
schema = get_example_default_schema()
energy_usage_ds = self.get_energy_usage_dataset()
self.login(username="admin")
table_data = {
"database": energy_usage_ds.database_id,
"table_name": energy_usage_ds.table_name,
}
if schema:
if schema := get_example_default_schema():
table_data["schema"] = schema
rv = self.post_assert_metric("/api/v1/dataset/", table_data, "post")
assert rv.status_code == 422
@@ -665,7 +664,6 @@ class TestDatasetApi(SupersetTestCase):
if backend() == "sqlite":
return
schema = get_example_default_schema()
energy_usage_ds = self.get_energy_usage_dataset()
self.login(username="admin")
table_data = {
@@ -673,7 +671,7 @@ class TestDatasetApi(SupersetTestCase):
"table_name": energy_usage_ds.table_name,
"sql": "select * from energy_usage",
}
if schema:
if schema := get_example_default_schema():
table_data["schema"] = schema
rv = self.post_assert_metric("/api/v1/dataset/", table_data, "post")
assert rv.status_code == 422
@@ -690,7 +688,6 @@ class TestDatasetApi(SupersetTestCase):
if backend() == "sqlite":
return
schema = get_example_default_schema()
energy_usage_ds = self.get_energy_usage_dataset()
self.login(username="alpha")
admin = self.get_user("admin")
@@ -701,7 +698,7 @@ class TestDatasetApi(SupersetTestCase):
"sql": "select * from energy_usage",
"owners": [admin.id],
}
if schema:
if schema := get_example_default_schema():
table_data["schema"] = schema
rv = self.post_assert_metric("/api/v1/dataset/", table_data, "post")
assert rv.status_code == 201