Simplify string expressions (#12093)

Author: mik-laj

airflow/contrib/operators/gcs_to_gdrive_operator.py

@@ -23,7 +23,7 @@
 from airflow.providers.google.suite.transfers.gcs_to_gdrive import GCSToGoogleDriveOperator  # noqa
 
 warnings.warn(
-    "This module is deprecated. " "Please use `airflow.providers.google.suite.transfers.gcs_to_gdrive.",
+    "This module is deprecated. Please use `airflow.providers.google.suite.transfers.gcs_to_gdrive.",
     DeprecationWarning,
     stacklevel=2,
 )

airflow/executors/kubernetes_executor.py

@@ -170,7 +170,7 @@ def run(self) -> None:
                 )
             except ReadTimeoutError:
                 self.log.warning(
-                    "There was a timeout error accessing the Kube API. " "Retrying request.", exc_info=True
+                    "There was a timeout error accessing the Kube API. Retrying request.", exc_info=True
                 )
                 time.sleep(1)
             except Exception:
@@ -736,7 +736,7 @@ def adopt_launched_task(self, kube_client, pod, pod_ids: dict):
         pod_id = create_pod_id(dag_id=dag_id, task_id=task_id)
         if pod_id not in pod_ids:
             self.log.error(
-                "attempting to adopt task %s in dag %s" " which was not specified by database",
+                "attempting to adopt task %s in dag %s which was not specified by database",
                 task_id,
                 dag_id,
             )

airflow/jobs/scheduler_job.py

@@ -509,7 +509,7 @@ def manage_slas(self, dag: DAG, session: Session = None) -> None:
                     notification_sent = True
                 except Exception:  # pylint: disable=broad-except
                     Stats.incr('sla_email_notification_failure')
-                    self.log.exception("Could not send SLA Miss email notification for" " DAG %s", dag.dag_id)
+                    self.log.exception("Could not send SLA Miss email notification for DAG %s", dag.dag_id)
             # If we sent any notification, update the sla_miss table
             if notification_sent:
                 for sla in slas:

airflow/kubernetes/pod_generator.py

@@ -132,10 +132,10 @@ def __init__(  # pylint: disable=too-many-arguments,too-many-locals
     ):
         if not pod_template_file and not pod:
             raise AirflowConfigException(
-                "Podgenerator requires either a " "`pod` or a `pod_template_file` argument"
+                "Podgenerator requires either a `pod` or a `pod_template_file` argument"
             )
         if pod_template_file and pod:
-            raise AirflowConfigException("Cannot pass both `pod` " "and `pod_template_file` arguments")
+            raise AirflowConfigException("Cannot pass both `pod` and `pod_template_file` arguments")
 
         if pod_template_file:
             self.ud_pod = self.deserialize_model_file(pod_template_file)
@@ -199,7 +199,7 @@ def from_obj(obj) -> Optional[Union[dict, k8s.V1Pod]]:
             return PodGenerator.from_legacy_obj(obj)
         else:
             raise TypeError(
-                'Cannot convert a non-kubernetes.client.models.V1Pod' 'object into a KubernetesExecutorConfig'
+                'Cannot convert a non-kubernetes.client.models.V1Pod object into a KubernetesExecutorConfig'
             )
 
     @staticmethod

airflow/kubernetes/pod_launcher.py

@@ -83,7 +83,7 @@ def run_pod_async(self, pod: V1Pod, **kwargs):
             )
             self.log.debug('Pod Creation Response: %s', resp)
         except Exception as e:
-            self.log.exception('Exception when attempting ' 'to create Namespaced Pod: %s', json_pod)
+            self.log.exception('Exception when attempting to create Namespaced Pod: %s', json_pod)
             raise e
         return resp
 

airflow/models/connection.py

@@ -337,7 +337,7 @@ def log_info(self):
             DeprecationWarning,
             stacklevel=2,
         )
-        return "id: {}. Host: {}, Port: {}, Schema: {}, " "Login: {}, Password: {}, extra: {}".format(
+        return "id: {}. Host: {}, Port: {}, Schema: {}, Login: {}, Password: {}, extra: {}".format(
             self.conn_id,
             self.host,
             self.port,
@@ -358,7 +358,7 @@ def debug_info(self):
             DeprecationWarning,
             stacklevel=2,
         )
-        return "id: {}. Host: {}, Port: {}, Schema: {}, " "Login: {}, Password: {}, extra: {}".format(
+        return "id: {}. Host: {}, Port: {}, Schema: {}, Login: {}, Password: {}, extra: {}".format(
             self.conn_id,
             self.host,
             self.port,

airflow/models/dag.py

@@ -1304,7 +1304,7 @@ def clear(
         if confirm_prompt:
             ti_list = "\n".join([str(t) for t in tis])
             question = (
-                "You are about to delete these {count} tasks:\n" "{ti_list}\n\n" "Are you sure? (yes/no): "
+                "You are about to delete these {count} tasks:\n{ti_list}\n\nAre you sure? (yes/no): "
             ).format(count=count, ti_list=ti_list)
             do_it = utils.helpers.ask_yesno(question)
 
@@ -1367,9 +1367,7 @@ def clear_dags(
             return 0
         if confirm_prompt:
             ti_list = "\n".join([str(t) for t in all_tis])
-            question = (
-                "You are about to delete these {} tasks:\n" "{}\n\n" "Are you sure? (yes/no): "
-            ).format(count, ti_list)
+            question = f"You are about to delete these {count} tasks:\n{ti_list}\n\nAre you sure? (yes/no): "
             do_it = utils.helpers.ask_yesno(question)
 
         if do_it:

airflow/models/dagbag.py

@@ -139,7 +139,7 @@ def size(self) -> int:
     def store_serialized_dags(self) -> bool:
         """Whether or not to read dags from DB"""
         warnings.warn(
-            "The store_serialized_dags property has been deprecated. " "Use read_dags_from_db instead.",
+            "The store_serialized_dags property has been deprecated. Use read_dags_from_db instead.",
             DeprecationWarning,
             stacklevel=2,
         )

airflow/models/dagrun.py

@@ -599,15 +599,13 @@ def verify_integrity(self, session: Session = None):
                 if ti.state == State.REMOVED:
                     pass  # ti has already been removed, just ignore it
                 elif self.state is not State.RUNNING and not dag.partial:
-                    self.log.warning(
-                        "Failed to get task '%s' for dag '%s'. " "Marking it as removed.", ti, dag
-                    )
+                    self.log.warning("Failed to get task '%s' for dag '%s'. Marking it as removed.", ti, dag)
                     Stats.incr(f"task_removed_from_dag.{dag.dag_id}", 1, 1)
                     ti.state = State.REMOVED
 
             should_restore_task = (task is not None) and ti.state == State.REMOVED
             if should_restore_task:
-                self.log.info("Restoring task '%s' which was previously " "removed from DAG '%s'", ti, dag)
+                self.log.info("Restoring task '%s' which was previously removed from DAG '%s'", ti, dag)
                 Stats.incr(f"task_restored_to_dag.{dag.dag_id}", 1, 1)
                 ti.state = State.NONE
             session.merge(ti)

airflow/models/serialized_dag.py

@@ -155,7 +155,7 @@ def read_all_dags(cls, session: Session = None) -> Dict[str, 'SerializedDAG']:
                 dags[row.dag_id] = dag
             else:
                 log.warning(
-                    "dag_id Mismatch in DB: Row with dag_id '%s' has Serialised DAG " "with '%s' dag_id",
+                    "dag_id Mismatch in DB: Row with dag_id '%s' has Serialised DAG with '%s' dag_id",
                     row.dag_id,
                     dag.dag_id,
                 )
@@ -192,7 +192,7 @@ def remove_deleted_dags(cls, alive_dag_filelocs: List[str], session=None):
         alive_fileloc_hashes = [DagCode.dag_fileloc_hash(fileloc) for fileloc in alive_dag_filelocs]
 
         log.debug(
-            "Deleting Serialized DAGs (for which DAG files are deleted) " "from %s table ", cls.__tablename__
+            "Deleting Serialized DAGs (for which DAG files are deleted) from %s table ", cls.__tablename__
         )
 
         # pylint: disable=no-member