You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by ur...@apache.org on 2023/09/11 05:06:06 UTC
[airflow] branch main updated: Replace unnecessary dict comprehension with dict() in core (#33858)
This is an automated email from the ASF dual-hosted git repository.
uranusjr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 6a33d058a1 Replace unnecessary dict comprehension with dict() in core (#33858)
6a33d058a1 is described below
commit 6a33d058a14cefe054c5aa4a683124220b53f005
Author: Hussein Awala <hu...@awala.fr>
AuthorDate: Mon Sep 11 07:05:58 2023 +0200
Replace unnecessary dict comprehension with dict() in core (#33858)
Co-authored-by: Tzu-ping Chung <ur...@gmail.com>
---
airflow/api/common/experimental/get_lineage.py | 2 +-
airflow/models/dagrun.py | 2 +-
airflow/operators/python.py | 2 +-
airflow/www/decorators.py | 2 +-
airflow/www/views.py | 6 +++---
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/airflow/api/common/experimental/get_lineage.py b/airflow/api/common/experimental/get_lineage.py
index 45bf2249c0..969d334545 100644
--- a/airflow/api/common/experimental/get_lineage.py
+++ b/airflow/api/common/experimental/get_lineage.py
@@ -49,4 +49,4 @@ def get_lineage(
for meta in outlets:
lineage[meta.task_id]["outlets"] = meta.value
- return {"task_ids": {k: v for k, v in lineage.items()}}
+ return {"task_ids": dict(lineage)}
diff --git a/airflow/models/dagrun.py b/airflow/models/dagrun.py
index 11a6702747..7308758333 100644
--- a/airflow/models/dagrun.py
+++ b/airflow/models/dagrun.py
@@ -307,7 +307,7 @@ class DagRun(Base, LoggingMixin):
else:
query = query.where(cls.state.in_((DagRunState.RUNNING, DagRunState.QUEUED)))
query = query.group_by(cls.dag_id)
- return {dag_id: count for dag_id, count in session.execute(query)}
+ return dict(iter(session.execute(query)))
@classmethod
def next_dagruns_to_examine(
diff --git a/airflow/operators/python.py b/airflow/operators/python.py
index 1d6fd2eb3b..c756454040 100644
--- a/airflow/operators/python.py
+++ b/airflow/operators/python.py
@@ -421,7 +421,7 @@ class _BasePythonVirtualenvOperator(PythonOperator, metaclass=ABCMeta):
return super().__deepcopy__(memo)
def _execute_python_callable_in_subprocess(self, python_path: Path, tmp_dir: Path):
- op_kwargs: dict[str, Any] = {k: v for k, v in self.op_kwargs.items()}
+ op_kwargs: dict[str, Any] = dict(self.op_kwargs)
if self.templates_dict:
op_kwargs["templates_dict"] = self.templates_dict
input_path = tmp_dir / "script.in"
diff --git a/airflow/www/decorators.py b/airflow/www/decorators.py
index 94c1c34921..38aed59de9 100644
--- a/airflow/www/decorators.py
+++ b/airflow/www/decorators.py
@@ -102,7 +102,7 @@ def action_logging(func: Callable | None = None, event: str | None = None) -> Ca
if event and event.startswith("connection."):
extra_fields = _mask_connection_fields(extra_fields)
- params = {k: v for k, v in itertools.chain(request.values.items(), request.view_args.items())}
+ params = {**request.values, **request.view_args}
log = Log(
event=event or f.__name__,
diff --git a/airflow/www/views.py b/airflow/www/views.py
index bd4efb211c..095f2b3410 100644
--- a/airflow/www/views.py
+++ b/airflow/www/views.py
@@ -3798,11 +3798,11 @@ class Airflow(AirflowBaseView):
data = {
"dag_run_types": {
**{dag_run_type.value: 0 for dag_run_type in DagRunType},
- **{run_type: sum_value for run_type, sum_value in dag_run_types},
+ **dict(dag_run_types),
},
"dag_run_states": {
**{dag_run_state.value: 0 for dag_run_state in DagRunState},
- **{run_state: sum_value for run_state, sum_value in dag_run_states},
+ **dict(dag_run_states),
},
"task_instance_states": {
"no_status": 0,
@@ -4649,7 +4649,7 @@ class ConnectionModelView(AirflowModelView):
select(Connection.conn_id).where(Connection.conn_id.in_(potential_connection_ids))
)
- found_conn_id_set = {conn_id for conn_id in query}
+ found_conn_id_set = set(query)
possible_conn_id_iter = (
connection_id