From 2a2e02aea4786c07f072d5be131dbd8c793431c9 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Fri, 24 Mar 2017 12:38:16 -0400 Subject: [PATCH] .--. . .--. ---.. / .. ... / .- -. -. --- -.-- .. -. --. --- docs/bin/generate_man.py | 7 +++++-- lib/ansible/cli/console.py | 6 ++---- lib/ansible/cli/pull.py | 6 ++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/docs/bin/generate_man.py b/docs/bin/generate_man.py index 337b39c1f6f..d231b462327 100755 --- a/docs/bin/generate_man.py +++ b/docs/bin/generate_man.py @@ -6,6 +6,7 @@ import sys from jinja2 import Environment, FileSystemLoader + def get_options(optlist): ''' get actual options ''' @@ -21,6 +22,7 @@ def get_options(optlist): return opts + def opt_doc_list(cli): ''' iterate over options lists ''' @@ -32,6 +34,7 @@ def opt_doc_list(cli): return results + def opts_docs(cli, name): ''' generate doc structure from options ''' @@ -39,7 +42,7 @@ def opts_docs(cli, name): if '-' in name: name = name.split('-')[1] else: - name = 'adhoc' + name = 'adhoc' # cli info docs = { @@ -83,7 +86,7 @@ if __name__ == '__main__': libname = os.path.splitext(binary)[0] print("Found CLI %s" % libname) - if libname == 'adhoc': + if libname == 'adhoc': myclass = 'AdHocCLI' output[libname] = 'ansible.1.asciidoc.in' else: diff --git a/lib/ansible/cli/console.py b/lib/ansible/cli/console.py index 2116ffb79ac..69c11014c32 100644 --- a/lib/ansible/cli/console.py +++ b/lib/ansible/cli/console.py @@ -61,10 +61,8 @@ class ConsoleCLI(CLI, cmd.Cmd): ''' a REPL that allows for running ad-hoc tasks against a chosen inventory (based on dominis' ansible-shell).''' modules = [] - ARGUMENTS = { - 'host-pattern': 'A name of a group in the inventory, a shell-like glob ' - 'selecting hosts in inventory or any combination of the two separated by commas.', - } + ARGUMENTS = { 'host-pattern': 'A name of a group in the inventory, a shell-like glob ' + 'selecting hosts in inventory or any combination of the two separated by commas.', } def __init__(self, args): diff --git a/lib/ansible/cli/pull.py b/lib/ansible/cli/pull.py index 105992e8307..d7a81655b7d 100644 --- a/lib/ansible/cli/pull.py +++ b/lib/ansible/cli/pull.py @@ -62,12 +62,10 @@ class PullCLI(CLI): 2: 'File is not readable' } SUPPORTED_REPO_MODULES = ['git'] - ARGUMENTS = { - 'playbook.yml': 'The name of one the YAML format files to run as an Ansible playbook.' + ARGUMENTS = { 'playbook.yml': 'The name of one the YAML format files to run as an Ansible playbook.' 'This can be a relative path within the checkout. By default, Ansible will' "look for a playbook based on the host's fully-qualified domain name," - 'on the host hostname and finally a playbook named *local.yml*.', - } + 'on the host hostname and finally a playbook named *local.yml*.', } def parse(self): ''' create an options parser for bin/ansible '''