Simplify string expressions & Use f-string (#12216)

* Simplify string expressions & Use f-string This is a follow-up clean-up work for the minor issues caused in the process of introducing Black * Fixup
apache · Nov 10, 2020 · dd2095f · dd2095f
1 parent 0443f04
commit dd2095f
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 37 deletions.
diff --git a/airflow/cli/cli_parser.py b/airflow/cli/cli_parser.py
@@ -363,7 +363,7 @@ def positive_int(value):
 # instead.
 ARG_INTERACTIVE = Arg(
  ('-N', '--interactive'),
- help='Do not capture standard output and error streams ' '(useful for interactive debugging)',
+ help='Do not capture standard output and error streams (useful for interactive debugging)',
  action='store_true',
 )
 ARG_FORCE = Arg(
@@ -573,15 +573,15 @@ def positive_int(value):
 ARG_LASTNAME = Arg(('-l', '--lastname'), help='Last name of the user', required=True, type=str)
 ARG_ROLE = Arg(
  ('-r', '--role'),
- help='Role of the user. Existing roles include Admin, ' 'User, Op, Viewer, and Public',
+ help='Role of the user. Existing roles include Admin, User, Op, Viewer, and Public',
  required=True,
  type=str,
 )
 ARG_EMAIL = Arg(('-e', '--email'), help='Email of the user', required=True, type=str)
 ARG_EMAIL_OPTIONAL = Arg(('-e', '--email'), help='Email of the user', type=str)
 ARG_PASSWORD = Arg(
  ('-p', '--password'),
- help='Password of the user, required to create a user ' 'without --use-random-password',
+ help='Password of the user, required to create a user without --use-random-password',
  type=str,
 )
 ARG_USE_RANDOM_PASSWORD = Arg(
@@ -628,7 +628,7 @@ def positive_int(value):
 # info
 ARG_ANONYMIZE = Arg(
  ('--anonymize',),
- help=('Minimize any personal identifiable information. ' 'Use it when sharing output with others.'),
+ help='Minimize any personal identifiable information. Use it when sharing output with others.',
  action='store_true',
 )
 ARG_FILE_IO = Arg(

diff --git a/airflow/cli/commands/user_command.py b/airflow/cli/commands/user_command.py
@@ -92,7 +92,7 @@ def users_manage_role(args, remove=False):
  raise SystemExit('Missing args: must supply one of --username or --email')
 
  if args.username and args.email:
- raise SystemExit('Conflicting args: must supply either --username' ' or --email, but not both')
+ raise SystemExit('Conflicting args: must supply either --username or --email, but not both')
 
  appbuilder = cached_app().appbuilder # pylint: disable=no-member
  user = appbuilder.sm.find_user(username=args.username) or appbuilder.sm.find_user(email=args.email)

diff --git a/airflow/executors/kubernetes_executor.py b/airflow/executors/kubernetes_executor.py
@@ -112,7 +112,7 @@ def run(self) -> None:
  raise
  else:
  self.log.warning(
- 'Watch died gracefully, starting back up with: ' 'last resource_version: %s',
+ 'Watch died gracefully, starting back up with: last resource_version: %s',
  self.resource_version,
  )
 
@@ -263,7 +263,7 @@ def _health_check_kube_watcher(self):
  self.log.debug("KubeJobWatcher alive, continuing")
  else:
  self.log.error(
- 'Error while health checking kube watcher process. ' 'Process died for unknown reasons'
+ 'Error while health checking kube watcher process. Process died for unknown reasons'
  )
  self.kube_watcher = self._make_kube_watcher()
 
@@ -478,7 +478,7 @@ def clear_not_launched_queued_tasks(self, session=None) -> None:
  pod_list = self.kube_client.list_namespaced_pod(self.kube_config.kube_namespace, **kwargs)
  if not pod_list.items:
  self.log.info(
- 'TaskInstance: %s found in queued state but was not launched, ' 'rescheduling', task
+ 'TaskInstance: %s found in queued state but was not launched, rescheduling', task
  )
  session.query(TaskInstance).filter(
  TaskInstance.dag_id == task.dag_id,
@@ -509,7 +509,7 @@ def _create_or_update_secret(secret_name, secret_path):
  **self.kube_config.kube_client_request_args,
  )
  self.log.exception(
- 'Exception while trying to inject secret. ' 'Secret name: %s, error details: %s',
+ 'Exception while trying to inject secret. Secret name: %s, error details: %s',
  secret_name,
  e,
  )
@@ -605,7 +605,7 @@ def sync(self) -> None:
  self.change_state(key, State.FAILED, e)
  else:
  self.log.warning(
- 'ApiException when attempting to run task, re-queueing. ' 'Message: %s',
+ 'ApiException when attempting to run task, re-queueing. Message: %s',
  json.loads(e.body)['message'],
  )
  self.task_queue.put(task)
@@ -729,7 +729,7 @@ def _flush_result_queue(self) -> None:
  self._change_state(key, state, pod_id, namespace)
  except Exception as e: # pylint: disable=broad-except
  self.log.exception(
- 'Ignoring exception: %s when attempting to change state of %s ' 'to %s.',
+ 'Ignoring exception: %s when attempting to change state of %s to %s.',
  e,
  results,
  state,

diff --git a/airflow/models/baseoperator.py b/airflow/models/baseoperator.py
@@ -1194,7 +1194,7 @@ def _set_relatives(
 
  if len(dags) > 1:
  raise AirflowException(
- 'Tried to set relationships between tasks in ' 'more than one DAG: {}'.format(dags.values())
+ f'Tried to set relationships between tasks in more than one DAG: {dags.values()}'
  )
  elif len(dags) == 1:
  dag = dags.popitem()[1]

diff --git a/airflow/models/dagrun.py b/airflow/models/dagrun.py
@@ -135,7 +135,7 @@ def __init__(
 
  def __repr__(self):
  return (
- '<DagRun {dag_id} @ {execution_date}: {run_id}, ' 'externally triggered: {external_trigger}>'
+ '<DagRun {dag_id} @ {execution_date}: {run_id}, externally triggered: {external_trigger}>'
  ).format(
  dag_id=self.dag_id,
  execution_date=self.execution_date,

diff --git a/airflow/providers/apache/druid/hooks/druid.py b/airflow/providers/apache/druid/hooks/druid.py
@@ -93,7 +93,7 @@ def submit_indexing_job(self, json_index_spec: Dict[str, Any]) -> None:
  self.log.info("Druid ingestion spec: %s", json_index_spec)
  req_index = requests.post(url, data=json_index_spec, headers=self.header, auth=self.get_auth())
  if req_index.status_code != 200:
- raise AirflowException('Did not get 200 when ' 'submitting the Druid job to {}'.format(url))
+ raise AirflowException(f'Did not get 200 when submitting the Druid job to {url}')
 
  req_json = req_index.json()
  # Wait until the job is completed

diff --git a/airflow/providers/google/cloud/hooks/bigquery.py b/airflow/providers/google/cloud/hooks/bigquery.py
@@ -2067,7 +2067,7 @@ def run_query(
  _validate_value("api_resource_configs['query']", configuration['query'], dict)
 
  if sql is None and not configuration['query'].get('query', None):
- raise TypeError('`BigQueryBaseCursor.run_query` ' 'missing 1 required positional argument: `sql`')
+ raise TypeError('`BigQueryBaseCursor.run_query` missing 1 required positional argument: `sql`')
 
  # BigQuery also allows you to define how you want a table's schema to change
  # as a side effect of a query job
@@ -2801,9 +2801,7 @@ def _split_tablename(
 ) -> Tuple[str, str, str]:
 
  if '.' not in table_input:
- raise ValueError(
- 'Expected target table name in the format of ' '<dataset>.<table>. Got: {}'.format(table_input)
- )
+ raise ValueError(f'Expected table name in the format of <dataset>.<table>. Got: {table_input}')
 
  if not default_project_id:
  raise ValueError("INTERNAL: No default project is specified")

diff --git a/airflow/providers/google/cloud/hooks/gcs.py b/airflow/providers/google/cloud/hooks/gcs.py
@@ -630,7 +630,7 @@ def get_crc32c(self, bucket_name: str, object_name: str):
  :type object_name: str
  """
  self.log.info(
- 'Retrieving the crc32c checksum of ' 'object_name: %s in bucket_name: %s',
+ 'Retrieving the crc32c checksum of object_name: %s in bucket_name: %s',
  object_name,
  bucket_name,
  )
@@ -651,7 +651,7 @@ def get_md5hash(self, bucket_name: str, object_name: str) -> str:
  storage bucket_name.
  :type object_name: str
  """
- self.log.info('Retrieving the MD5 hash of ' 'object: %s in bucket: %s', object_name, bucket_name)
+ self.log.info('Retrieving the MD5 hash of object: %s in bucket: %s', object_name, bucket_name)
  client = self.get_conn()
  bucket = client.bucket(bucket_name)
  blob = bucket.get_blob(blob_name=object_name)

diff --git a/airflow/providers/google/cloud/hooks/mlengine.py b/airflow/providers/google/cloud/hooks/mlengine.py
@@ -140,7 +140,7 @@ def create_job(self, job: dict, project_id: str, use_existing_job_fn: Optional[C
  existing_job = self._get_job(project_id, job_id)
  if not use_existing_job_fn(existing_job):
  self.log.error(
- 'Job with job_id %s already exist, but it does ' 'not match our expectation: %s',
+ 'Job with job_id %s already exist, but it does not match our expectation: %s',
  job_id,
  existing_job,
  )

diff --git a/airflow/providers/microsoft/azure/hooks/azure_batch.py b/airflow/providers/microsoft/azure/hooks/azure_batch.py
@@ -148,7 +148,7 @@ def configure_pool( # pylint: disable=too-many-arguments
 
  elif os_family:
  self.log.info(
- 'Using cloud service configuration to create pool, ' 'virtual machine configuration ignored'
+ 'Using cloud service configuration to create pool, virtual machine configuration ignored'
  )
  pool = batch_models.PoolAddParameter(
  id=pool_id,

diff --git a/airflow/providers/slack/hooks/slack.py b/airflow/providers/slack/hooks/slack.py
@@ -80,7 +80,7 @@ def __get_token(self, token: Any, slack_conn_id: Any) -> str:
  raise AirflowException('Missing token(password) in Slack connection')
  return conn.password
 
- raise AirflowException('Cannot get token: ' 'No valid Slack token nor slack_conn_id supplied.')
+ raise AirflowException('Cannot get token: No valid Slack token nor slack_conn_id supplied.')
 
  def call(self, api_method: str, *args, **kwargs) -> None:
  """

diff --git a/airflow/providers/slack/hooks/slack_webhook.py b/airflow/providers/slack/hooks/slack_webhook.py
@@ -107,7 +107,7 @@ def _get_token(self, token: str, http_conn_id: Optional[str]) -> str:
  extra = conn.extra_dejson
  return extra.get('webhook_token', '')
  else:
- raise AirflowException('Cannot get token: No valid Slack ' 'webhook token nor conn_id supplied')
+ raise AirflowException('Cannot get token: No valid Slack webhook token nor conn_id supplied')
 
  def _build_slack_message(self) -> str:
  """

diff --git a/airflow/providers/ssh/hooks/ssh.py b/airflow/providers/ssh/hooks/ssh.py
@@ -184,9 +184,7 @@ def get_conn(self) -> paramiko.SSHClient:
  )
  client.load_system_host_keys()
  if self.no_host_key_check:
- self.log.warning(
- 'No Host Key Verification. This wont protect ' 'against Man-In-The-Middle attacks'
- )
+ self.log.warning('No Host Key Verification. This wont protect against Man-In-The-Middle attacks')
  # Default is RejectPolicy
  client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
  connect_kwargs = dict(

diff --git a/tests/providers/apache/druid/hooks/test_druid.py b/tests/providers/apache/druid/hooks/test_druid.py
@@ -47,7 +47,7 @@ def test_submit_gone_wrong(self, m):
  text='{"task":"9f8a7359-77d4-4612-b0cd-cc2f6a3c28de"}',
  )
  status_check = m.get(
- 'http://druid-overlord:8081/druid/indexer/v1/task/' '9f8a7359-77d4-4612-b0cd-cc2f6a3c28de/status',
+ 'http://druid-overlord:8081/druid/indexer/v1/task/9f8a7359-77d4-4612-b0cd-cc2f6a3c28de/status',
  text='{"status":{"status": "FAILED"}}',
  )
 
@@ -65,7 +65,7 @@ def test_submit_ok(self, m):
  text='{"task":"9f8a7359-77d4-4612-b0cd-cc2f6a3c28de"}',
  )
  status_check = m.get(
- 'http://druid-overlord:8081/druid/indexer/v1/task/' '9f8a7359-77d4-4612-b0cd-cc2f6a3c28de/status',
+ 'http://druid-overlord:8081/druid/indexer/v1/task/9f8a7359-77d4-4612-b0cd-cc2f6a3c28de/status',
  text='{"status":{"status": "SUCCESS"}}',
  )
 
@@ -82,7 +82,7 @@ def test_submit_correct_json_body(self, m):
  text='{"task":"9f8a7359-77d4-4612-b0cd-cc2f6a3c28de"}',
  )
  status_check = m.get(
- 'http://druid-overlord:8081/druid/indexer/v1/task/' '9f8a7359-77d4-4612-b0cd-cc2f6a3c28de/status',
+ 'http://druid-overlord:8081/druid/indexer/v1/task/9f8a7359-77d4-4612-b0cd-cc2f6a3c28de/status',
  text='{"status":{"status": "SUCCESS"}}',
  )
 
@@ -106,7 +106,7 @@ def test_submit_unknown_response(self, m):
  text='{"task":"9f8a7359-77d4-4612-b0cd-cc2f6a3c28de"}',
  )
  status_check = m.get(
- 'http://druid-overlord:8081/druid/indexer/v1/task/' '9f8a7359-77d4-4612-b0cd-cc2f6a3c28de/status',
+ 'http://druid-overlord:8081/druid/indexer/v1/task/9f8a7359-77d4-4612-b0cd-cc2f6a3c28de/status',
  text='{"status":{"status": "UNKNOWN"}}',
  )
 
@@ -126,7 +126,7 @@ def test_submit_timeout(self, m):
  text='{"task":"9f8a7359-77d4-4612-b0cd-cc2f6a3c28de"}',
  )
  status_check = m.get(
- 'http://druid-overlord:8081/druid/indexer/v1/task/' '9f8a7359-77d4-4612-b0cd-cc2f6a3c28de/status',
+ 'http://druid-overlord:8081/druid/indexer/v1/task/9f8a7359-77d4-4612-b0cd-cc2f6a3c28de/status',
  text='{"status":{"status": "RUNNING"}}',
  )
  shutdown_post = m.post(

diff --git a/tests/providers/google/cloud/hooks/test_kubernetes_engine.py b/tests/providers/google/cloud/hooks/test_kubernetes_engine.py
@@ -240,7 +240,7 @@ def setUp(self):
  self.gke_hook = GKEHook(location=GKE_ZONE)
  self.gke_hook._client = mock.Mock()
 
- @mock.patch('airflow.providers.google.cloud.hooks.kubernetes_engine.container_v1.' 'ClusterManagerClient')
+ @mock.patch('airflow.providers.google.cloud.hooks.kubernetes_engine.container_v1.ClusterManagerClient')
  @mock.patch('airflow.providers.google.common.hooks.base_google.ClientInfo')
  @mock.patch('airflow.providers.google.cloud.hooks.kubernetes_engine.GKEHook._get_credentials')
  def test_get_client(self, mock_get_credentials, mock_client_info, mock_client):

diff --git a/tests/providers/google/cloud/operators/test_cloud_sql_system_helper.py b/tests/providers/google/cloud/operators/test_cloud_sql_system_helper.py
@@ -272,7 +272,7 @@ def __create_instance(
 
  self.log.info('... Done creating a test %s instance "%s"!\n', db_version, instance_name)
  except Exception as ex:
- self.log.error('Exception occurred. ' 'Aborting creating a test instance.\n\n%s', ex)
+ self.log.error('Exception occurred. Aborting creating a test instance.\n\n%s', ex)
  raise ex
 
  def __delete_service_accounts_acls(self):
@@ -350,7 +350,7 @@ def __setup_instance_and_certs(
  self.__create_db(instance_name, db_name)
  self.log.info('... Done setting up a test %s instance "%s"!\n', db_version, instance_name)
  except Exception as ex:
- self.log.error('Exception occurred. ' 'Aborting setting up test instance and certs.\n\n%s', ex)
+ self.log.error('Exception occurred. Aborting setting up test instance and certs.\n\n%s', ex)
  raise ex
 
  def __delete_instance(self, instance_name: str, master_instance_name: Optional[str]) -> None:

diff --git a/tests/providers/google/cloud/operators/test_compute.py b/tests/providers/google/cloud/operators/test_compute.py
@@ -361,10 +361,10 @@ def test_set_machine_type_should_throw_ex_when_missing_machine_type(self, mock_h
  )
 
  @mock.patch(
- 'airflow.providers.google.cloud.operators.compute.ComputeEngineHook' '._check_zone_operation_status'
+ 'airflow.providers.google.cloud.operators.compute.ComputeEngineHook._check_zone_operation_status'
  )
  @mock.patch(
- 'airflow.providers.google.cloud.operators.compute.ComputeEngineHook' '._execute_set_machine_type'
+ 'airflow.providers.google.cloud.operators.compute.ComputeEngineHook._execute_set_machine_type'
  )
  @mock.patch('airflow.providers.google.cloud.operators.compute.ComputeEngineHook.get_conn')
  def test_set_machine_type_should_handle_and_trim_gce_error(