Migrate cli and dependencies to use global display

lib/ansible/cli/__init__.py

@@ -33,7 +33,14 @@ from ansible import __version__
 from ansible import constants as C
 from ansible.errors import AnsibleError, AnsibleOptionsError
 from ansible.utils.unicode import to_bytes
-from ansible.utils.display import Display
+
+try:
+    from __main__ import display
+    display = display
+except ImportError:
+    from ansible.utils.display import Display
+    display = Display()
+
 
 class SortedOptParser(optparse.OptionParser):
     '''Optparser which sorts the options by opt before outputting --help'''
@@ -44,6 +51,7 @@ class SortedOptParser(optparse.OptionParser):
         self.option_list.sort(key=operator.methodcaller('get_opt_string'))
         return optparse.OptionParser.format_help(self, formatter=None)
 
+
 class CLI(object):
     ''' code behind bin/ansible* programs '''
 
@@ -59,7 +67,7 @@ class CLI(object):
     LESS_OPTS = 'FRSX'  # -F (quit-if-one-screen) -R (allow raw ansi control chars)
                         # -S (chop long lines) -X (disable termcap init and de-init)
 
-    def __init__(self, args, display=None):
+    def __init__(self, args):
         """
         Base init method for all command line programs
         """
@@ -69,11 +77,6 @@ class CLI(object):
         self.parser = None
         self.action = None
 
-        if display is None:
-            self.display = Display()
-        else:
-            self.display = display
-
     def set_action(self):
         """
         Get the action the user wants to execute from the sys argv list.
@@ -102,9 +105,9 @@ class CLI(object):
 
         if self.options.verbosity > 0:
             if C.CONFIG_FILE:
-                self.display.display("Using %s as config file" % C.CONFIG_FILE)
+                display.display("Using %s as config file" % C.CONFIG_FILE)
             else:
-                self.display.display("No config file found; using defaults")
+                display.display("No config file found; using defaults")
 
     @staticmethod
     def ask_vault_passwords(ask_new_vault_pass=False, rekey=False):
@@ -135,7 +138,6 @@ class CLI(object):
 
         return vault_pass, new_vault_pass
 
-
     def ask_passwords(self):
         ''' prompt for connection and become passwords if needed '''
 
@@ -164,7 +166,6 @@ class CLI(object):
 
         return (sshpass, becomepass)
 
-
     def normalize_become_options(self):
         ''' this keeps backwards compatibility with sudo/su self.options '''
         self.options.become_ask_pass = self.options.become_ask_pass or self.options.ask_sudo_pass or self.options.ask_su_pass or C.DEFAULT_BECOME_ASK_PASS
@@ -179,7 +180,6 @@ class CLI(object):
             self.options.become = True
             self.options.become_method = 'su'
 
-
     def validate_conflicts(self, vault_opts=False, runas_opts=False, fork_opts=False):
         ''' check for conflicting options '''
 
@@ -190,7 +190,6 @@ class CLI(object):
             if (op.ask_vault_pass and op.vault_password_file):
                 self.parser.error("--ask-vault-pass and --vault-password-file are mutually exclusive")
 
-
         if runas_opts:
             # Check for privilege escalation conflicts
             if (op.su or op.su_user or op.ask_su_pass) and \
@@ -215,7 +214,7 @@ class CLI(object):
 
     @staticmethod
     def base_parser(usage="", output_opts=False, runas_opts=False, meta_opts=False, runtask_opts=False, vault_opts=False, module_opts=False,
-        async_opts=False, connect_opts=False, subset_opts=False, check_opts=False, inventory_opts=False, epilog=None, fork_opts=False):
+            async_opts=False, connect_opts=False, subset_opts=False, check_opts=False, inventory_opts=False, epilog=None, fork_opts=False):
         ''' create an options parser for most ansible scripts '''
 
         # TODO: implement epilog parsing
@@ -257,7 +256,6 @@ class CLI(object):
             parser.add_option('--output', default=None, dest='output_file',
                 help='output file name for encrypt or decrypt; use - for stdout')
 
-
         if subset_opts:
             parser.add_option('-t', '--tags', dest='tags', default='all',
                 help="only run plays and tasks tagged with these values")
@@ -295,7 +293,6 @@ class CLI(object):
             parser.add_option('--ask-become-pass', default=False, dest='become_ask_pass', action='store_true',
                 help='ask for privilege escalation password')
 
-
         if connect_opts:
             parser.add_option('-k', '--ask-pass', default=C.DEFAULT_ASK_PASS, dest='ask_pass', action='store_true',
                 help='ask for connection password')
@@ -427,7 +424,7 @@ class CLI(object):
         result = CLI._git_repo_info(repo_path)
         submodules = os.path.join(basedir, '.gitmodules')
         if not os.path.exists(submodules):
-           return result
+            return result
         f = open(submodules)
         for line in f:
             tokens = line.strip().split(' ')
@@ -440,21 +437,20 @@ class CLI(object):
         f.close()
         return result
 
-
     def pager(self, text):
         ''' find reasonable way to display text '''
         # this is a much simpler form of what is in pydoc.py
         if not sys.stdout.isatty():
-            self.display.display(text)
+            display.display(text)
         elif 'PAGER' in os.environ:
             if sys.platform == 'win32':
-                self.display.display(text)
+                display.display(text)
             else:
                 self.pager_pipe(text, os.environ['PAGER'])
         elif subprocess.call('(less --version) 2> /dev/null', shell = True) == 0:
             self.pager_pipe(text, 'less')
         else:
-            self.display.display(text)
+            display.display(text)
 
     @staticmethod
     def pager_pipe(text, cmd):
@@ -521,4 +517,3 @@ class CLI(object):
             if os.pathsep in data:
                 data = data.split(os.pathsep)[0]
         return data
-