diff options
author | Shane McDonald <me@shanemcd.com> | 2023-05-10 14:19:23 +0200 |
---|---|---|
committer | Shane McDonald <me@shanemcd.com> | 2023-05-10 14:19:23 +0200 |
commit | f1196fc019313e081d40c8650b14dfe5b3f26898 (patch) | |
tree | 733ad81679bfc0563b8b4b823e270968aa352698 /awxkit | |
parent | Make state exists universal in collection (#13890) (diff) | |
download | awx-f1196fc019313e081d40c8650b14dfe5b3f26898.tar.xz awx-f1196fc019313e081d40c8650b14dfe5b3f26898.zip |
Clean up string formatting issues from black migration
Diffstat (limited to 'awxkit')
-rw-r--r-- | awxkit/awxkit/api/pages/system_job_templates.py | 2 | ||||
-rw-r--r-- | awxkit/awxkit/api/pages/unified_jobs.py | 4 | ||||
-rw-r--r-- | awxkit/awxkit/cli/format.py | 2 | ||||
-rw-r--r-- | awxkit/awxkit/cli/options.py | 4 | ||||
-rw-r--r-- | awxkit/awxkit/cli/sphinx.py | 2 | ||||
-rwxr-xr-x | awxkit/awxkit/scripts/basic_session.py | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/awxkit/awxkit/api/pages/system_job_templates.py b/awxkit/awxkit/api/pages/system_job_templates.py index 9362fbccb3..b6c053b608 100644 --- a/awxkit/awxkit/api/pages/system_job_templates.py +++ b/awxkit/awxkit/api/pages/system_job_templates.py @@ -13,7 +13,7 @@ class SystemJobTemplate(UnifiedJobTemplate, HasNotifications): # return job jobs_pg = self.get_related('jobs', id=result.json['system_job']) - assert jobs_pg.count == 1, "system_job_template launched (id:%s) but unable to find matching " "job at %s/jobs/" % (result.json['job'], self.url) + assert jobs_pg.count == 1, "system_job_template launched (id:%s) but unable to find matching job at %s/jobs/" % (result.json['job'], self.url) return jobs_pg.results[0] diff --git a/awxkit/awxkit/api/pages/unified_jobs.py b/awxkit/awxkit/api/pages/unified_jobs.py index 2c46a2db84..8954eec30b 100644 --- a/awxkit/awxkit/api/pages/unified_jobs.py +++ b/awxkit/awxkit/api/pages/unified_jobs.py @@ -40,7 +40,7 @@ class UnifiedJob(HasStatus, base.Base): Default behavior is to replace newline characters with a space, but this can be modified, including replacement with ''. Pass replace_newlines=None to disable. - Additionally, you may replace any ' ' with another character (including ''). This is applied after the newline + Additionally, you may replace any with another character (including ''). This is applied after the newline replacement. Default behavior is to not replace spaces. """ self.wait_until_completed() @@ -147,7 +147,7 @@ class UnifiedJob(HasStatus, base.Base): if host_loc.startswith(expected_prefix): return host_loc raise RuntimeError( - 'Could not find a controller private_data_dir for this job. ' 'Searched for volume mount to {} inside of args {}'.format(expected_prefix, job_args) + 'Could not find a controller private_data_dir for this job. Searched for volume mount to {} inside of args {}'.format(expected_prefix, job_args) ) diff --git a/awxkit/awxkit/cli/format.py b/awxkit/awxkit/cli/format.py index 2e8d9e5ae1..e7629a4b69 100644 --- a/awxkit/awxkit/cli/format.py +++ b/awxkit/awxkit/cli/format.py @@ -139,7 +139,7 @@ def format_jq(output, fmt): if fmt == '.': return output raise ImportError( - 'To use `-f jq`, you must install the optional jq dependency.\n' '`pip install jq`\n', + 'To use `-f jq`, you must install the optional jq dependency.\n`pip install jq`\n', 'Note that some platforms may require additional programs to ' 'build jq from source (like `libtool`).\n' 'See https://pypi.org/project/jq/ for instructions.', diff --git a/awxkit/awxkit/cli/options.py b/awxkit/awxkit/cli/options.py index fac14206fd..848e4f6bf7 100644 --- a/awxkit/awxkit/cli/options.py +++ b/awxkit/awxkit/cli/options.py @@ -55,7 +55,7 @@ def pk_or_name(v2, model_name, value, page=None): return int(results.results[0].id) if results.count > 1: raise argparse.ArgumentTypeError( - 'Multiple {0} exist with that {1}. ' 'To look up an ID, run:\n' 'awx {0} list --{1} "{2}" -f human'.format(model_name, identity, value) + 'Multiple {0} exist with that {1}. To look up an ID, run:\nawx {0} list --{1} "{2}" -f human'.format(model_name, identity, value) ) raise argparse.ArgumentTypeError('Could not find any {0} with that {1}.'.format(model_name, identity)) @@ -119,7 +119,7 @@ class ResourceOptionsParser(object): '--all', dest='all_pages', action='store_true', - help=('fetch all pages of content from the API when ' 'returning results (instead of just the first page)'), + help=('fetch all pages of content from the API when returning results (instead of just the first page)'), ) parser.add_argument( '--order_by', diff --git a/awxkit/awxkit/cli/sphinx.py b/awxkit/awxkit/cli/sphinx.py index bb5e36ce76..517801ed98 100644 --- a/awxkit/awxkit/cli/sphinx.py +++ b/awxkit/awxkit/cli/sphinx.py @@ -22,7 +22,7 @@ class CustomAutoprogramDirective(AutoprogramDirective): nodes[0][0].children = [heading] # add a descriptive top synopsis of the reference guide - nodes[0].children.insert(1, paragraph(text=('This is an exhaustive guide of every available command in ' 'the awx CLI tool.'))) + nodes[0].children.insert(1, paragraph(text=('This is an exhaustive guide of every available command in the awx CLI tool.'))) disclaimer = ( 'The commands and parameters documented here can (and will) ' 'vary based on a variety of factors, such as the AWX API ' diff --git a/awxkit/awxkit/scripts/basic_session.py b/awxkit/awxkit/scripts/basic_session.py index 5c58d70504..5ef5468371 100755 --- a/awxkit/awxkit/scripts/basic_session.py +++ b/awxkit/awxkit/scripts/basic_session.py @@ -33,7 +33,7 @@ def parse_args(): '--project-file', dest='project_file', default=os.getenv('AWXKIT_PROJECT_FILE'), - help='Path for yml project config file.' 'If not provided or set by AWXKIT_PROJECT_FILE, projects will not have default SCM_URL', + help='Path for yml project config file.If not provided or set by AWXKIT_PROJECT_FILE, projects will not have default SCM_URL', ) parser.add_argument('-f', '--file', dest='akit_script', default=False, help='akit script file to run in interactive session.') parser.add_argument('-x', '--non-interactive', action='store_true', dest='non_interactive', help='Do not run in interactive mode.') |