You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by be...@apache.org on 2023/08/16 18:40:58 UTC
[superset] branch rename_get_iterable updated: s/get_as_list/as_list/g
This is an automated email from the ASF dual-hosted git repository.
beto pushed a commit to branch rename_get_iterable
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/rename_get_iterable by this push:
new 78f5320a33 s/get_as_list/as_list/g
78f5320a33 is described below
commit 78f5320a334eb4f2d9f8668bbae2b5dd435edcba
Author: Beto Dealmeida <ro...@dealmeida.net>
AuthorDate: Wed Aug 16 11:40:44 2023 -0700
s/get_as_list/as_list/g
---
superset/connectors/base/models.py | 4 ++--
superset/daos/base.py | 4 ++--
superset/daos/chart.py | 2 +-
superset/daos/dashboard.py | 4 ++--
superset/daos/dataset.py | 4 ++--
superset/utils/core.py | 2 +-
tests/integration_tests/utils_tests.py | 10 +++++-----
7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/superset/connectors/base/models.py b/superset/connectors/base/models.py
index aa3a98af2d..d5386c7a66 100644
--- a/superset/connectors/base/models.py
+++ b/superset/connectors/base/models.py
@@ -334,7 +334,7 @@ class BaseDatasource(
form_data = slc.form_data
# pull out all required metrics from the form_data
for metric_param in METRIC_FORM_DATA_PARAMS:
- for metric in utils.get_as_list(form_data.get(metric_param) or []):
+ for metric in utils.as_list(form_data.get(metric_param) or []):
metric_names.add(utils.get_metric_name(metric))
if utils.is_adhoc_metric(metric):
column = metric.get("column") or {}
@@ -377,7 +377,7 @@ class BaseDatasource(
if utils.is_adhoc_column(column)
else column
for column_param in COLUMN_FORM_DATA_PARAMS
- for column in utils.get_as_list(form_data.get(column_param) or [])
+ for column in utils.as_list(form_data.get(column_param) or [])
]
column_names.update(_columns)
diff --git a/superset/daos/base.py b/superset/daos/base.py
index 02be4f8227..0bd0d76ead 100644
--- a/superset/daos/base.py
+++ b/superset/daos/base.py
@@ -30,7 +30,7 @@ from superset.daos.exceptions import (
DAOUpdateFailedError,
)
from superset.extensions import db
-from superset.utils.core import get_as_list
+from superset.utils.core import as_list
T = TypeVar("T", bound=Model)
@@ -216,7 +216,7 @@ class BaseDAO(Generic[T]):
"""
try:
- for item in get_as_list(items):
+ for item in as_list(items):
db.session.delete(item)
if commit:
diff --git a/superset/daos/chart.py b/superset/daos/chart.py
index 470ab86aed..463ec9a3b3 100644
--- a/superset/daos/chart.py
+++ b/superset/daos/chart.py
@@ -27,7 +27,7 @@ from superset.daos.base import BaseDAO
from superset.extensions import db
from superset.models.core import FavStar, FavStarClassName
from superset.models.slice import Slice
-from superset.utils.core import get_as_list, get_user_id
+from superset.utils.core import as_list, get_user_id
if TYPE_CHECKING:
from superset.connectors.base.models import BaseDatasource
diff --git a/superset/daos/dashboard.py b/superset/daos/dashboard.py
index 93152d26ff..067d44e8fc 100644
--- a/superset/daos/dashboard.py
+++ b/superset/daos/dashboard.py
@@ -48,7 +48,7 @@ from superset.models.dashboard import Dashboard, id_or_slug_filter
from superset.models.embedded_dashboard import EmbeddedDashboard
from superset.models.filter_set import FilterSet
from superset.models.slice import Slice
-from superset.utils.core import get_as_list, get_user_id
+from superset.utils.core import as_list, get_user_id
from superset.utils.dashboard_filter_scopes_converter import copy_filter_scopes
logger = logging.getLogger(__name__)
@@ -194,7 +194,7 @@ class DashboardDAO(BaseDAO[Dashboard]):
def delete(
cls, item_or_items: Dashboard | list[Dashboard], commit: bool = True
) -> None:
- items = cast(list[Dashboard], get_as_list(item_or_items))
+ items = cast(list[Dashboard], as_list(item_or_items))
item_ids = [item.id for item in items]
try:
db.session.query(Dashboard).filter(Dashboard.id.in_(item_ids)).delete(
diff --git a/superset/daos/dataset.py b/superset/daos/dataset.py
index 4e751b1b0f..561ae5d548 100644
--- a/superset/daos/dataset.py
+++ b/superset/daos/dataset.py
@@ -28,7 +28,7 @@ from superset.extensions import db
from superset.models.core import Database
from superset.models.dashboard import Dashboard
from superset.models.slice import Slice
-from superset.utils.core import DatasourceType, get_as_list
+from superset.utils.core import as_list, DatasourceType
from superset.views.base import DatasourceFilter
logger = logging.getLogger(__name__)
@@ -326,7 +326,7 @@ class DatasetDAO(BaseDAO[SqlaTable]): # pylint: disable=too-many-public-methods
:raises DAODeleteFailedError: If the deletion failed
:see: https://docs.sqlalchemy.org/en/latest/orm/queryguide/dml.html
"""
- items = cast(list[SqlaTable], get_as_list(item_or_items))
+ items = cast(list[SqlaTable], as_list(item_or_items))
try:
db.session.query(SqlaTable).filter(
SqlaTable.id.in_(item.id for item in items)
diff --git a/superset/utils/core.py b/superset/utils/core.py
index a45cb3565b..3e297b5c90 100644
--- a/superset/utils/core.py
+++ b/superset/utils/core.py
@@ -1581,7 +1581,7 @@ def split(
T = TypeVar("T")
-def get_as_list(x: T | list[T]) -> list[T]:
+def as_list(x: T | list[T]) -> list[T]:
"""
Wrap an object in a list if it's not a list.
diff --git a/tests/integration_tests/utils_tests.py b/tests/integration_tests/utils_tests.py
index 63c36923b0..6648d72c61 100644
--- a/tests/integration_tests/utils_tests.py
+++ b/tests/integration_tests/utils_tests.py
@@ -54,7 +54,7 @@ from superset.utils.core import (
format_timedelta,
GenericDataType,
get_form_data_token,
- get_as_list,
+ as_list,
get_email_address_list,
get_stacktrace,
json_int_dttm_ser,
@@ -749,10 +749,10 @@ class TestUtils(SupersetTestCase):
database = get_or_create_db("test_db", "sqlite:///superset.db")
assert database.sqlalchemy_uri == "sqlite:///superset.db"
- def test_get_as_list(self):
- self.assertListEqual(get_as_list(123), [123])
- self.assertListEqual(get_as_list([123]), [123])
- self.assertListEqual(get_as_list("foo"), ["foo"])
+ def test_as_list(self):
+ self.assertListEqual(as_list(123), [123])
+ self.assertListEqual(as_list([123]), [123])
+ self.assertListEqual(as_list("foo"), ["foo"])
@pytest.mark.usefixtures("load_world_bank_dashboard_with_slices")
def test_build_extra_filters(self):