summaryrefslogtreecommitdiff
path: root/openstackclient/common
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2017-02-01 17:31:34 -0600
committerDean Troyer <dtroyer@gmail.com>2017-02-01 17:31:39 -0600
commiteea09faae24a128d63742b98ac081cd38beaa834 (patch)
treeaeec67d699a084e041cb53a182053f6217291db2 /openstackclient/common
parent1e3dc48c64304eb378660ceb531aab3d42ac0710 (diff)
downloadpython-openstackclient-eea09faae24a128d63742b98ac081cd38beaa834.tar.gz
TODO cleanup: OSC_Config
os-client-config is now at 1.22.0 in global-requirements, we can remove this pw_func setting block as the pw_func arg to __init__() was added in 1.21.0. Change-Id: I5bbc3e3aae4f3e4c4333c73bba19bda65e0d8488
Diffstat (limited to 'openstackclient/common')
-rw-r--r--openstackclient/common/client_config.py34
1 files changed, 0 insertions, 34 deletions
diff --git a/openstackclient/common/client_config.py b/openstackclient/common/client_config.py
index ad86e9f8..ad037481 100644
--- a/openstackclient/common/client_config.py
+++ b/openstackclient/common/client_config.py
@@ -26,40 +26,6 @@ LOG = logging.getLogger(__name__)
# before auth plugins are loaded
class OSC_Config(client_config.OSC_Config):
- # TODO(dtroyer): Once os-client-config with pw_func argument is in
- # global-requirements we can remove __init()__
- def __init__(
- self,
- config_files=None,
- vendor_files=None,
- override_defaults=None,
- force_ipv4=None,
- envvar_prefix=None,
- secure_files=None,
- pw_func=None,
- ):
- ret = super(OSC_Config, self).__init__(
- config_files=config_files,
- vendor_files=vendor_files,
- override_defaults=override_defaults,
- force_ipv4=force_ipv4,
- envvar_prefix=envvar_prefix,
- secure_files=secure_files,
- )
-
- # NOTE(dtroyer): This will be pushed down into os-client-config
- # The default is there is no callback, the calling
- # application must specify what to use, typically
- # it will be osc_lib.shell.prompt_for_password()
- if '_pw_callback' not in vars(self):
- # Set the default if it doesn't already exist
- self._pw_callback = None
- if pw_func is not None:
- # Set the passed in value
- self._pw_callback = pw_func
-
- return ret
-
# TODO(dtroyer): Remove _auth_default_domain when the v3otp fix is
# backported to osc-lib, should be in release 1.3.0
def _auth_default_domain(self, config):