Merge "Clean up password prompt work-arounds"

Jenkins · openstack-gerrit · commit 7e1350815e09 · 2017-04-18T13:35:53.000Z
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
@@ -45,12 +45,12 @@ def __init__(
         self,
         cli_options=None,
         api_version=None,
+        pw_func=None,
     ):
         super(ClientManager, self).__init__(
             cli_options=cli_options,
             api_version=api_version,
-            # TODO(dtroyer): Remove this when osc-lib 1.2 is released
-            pw_func=shell.prompt_for_password,
+            pw_func=pw_func,
         )
 
         # TODO(dtroyer): For compatibility; mark this for removal when plugin
diff --git a/openstackclient/shell.py b/openstackclient/shell.py
@@ -170,6 +170,7 @@ def initialize_app(self, argv):
         self.client_manager = clientmanager.ClientManager(
             cli_options=self.cloud,
             api_version=self.api_version,
+            pw_func=shell.prompt_for_password,
         )
 
     def prepare_to_run_command(self, cmd):

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,7 @@ def initialize_app(self, argv):`
`170`	`170`	`self.client_manager = clientmanager.ClientManager(`
`171`	`171`	`cli_options=self.cloud,`
`172`	`172`	`api_version=self.api_version,`
	`173`	`+ pw_func=shell.prompt_for_password,`
`173`	`174`	`)`
`174`	`175`
`175`	`176`	`def prepare_to_run_command(self, cmd):`