From 3fe08cbfe5acc382ad907d29f77d7dcd938d5b77 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Mon, 21 Mar 2016 18:17:27 -0700 Subject: Support passing an alternate environment dict to kwargs_from_env Signed-off-by: Joffrey F --- docker/utils/utils.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'docker/utils/utils.py') diff --git a/docker/utils/utils.py b/docker/utils/utils.py index 70fcb1f..136466c 100644 --- a/docker/utils/utils.py +++ b/docker/utils/utils.py @@ -479,15 +479,17 @@ def parse_devices(devices): return device_list -def kwargs_from_env(ssl_version=None, assert_hostname=None): - host = os.environ.get('DOCKER_HOST') +def kwargs_from_env(ssl_version=None, assert_hostname=None, environment=None): + if not environment: + environment = os.environ + host = environment.get('DOCKER_HOST') # empty string for cert path is the same as unset. - cert_path = os.environ.get('DOCKER_CERT_PATH') or None + cert_path = environment.get('DOCKER_CERT_PATH') or None # empty string for tls verify counts as "false". # Any value or 'unset' counts as true. - tls_verify = os.environ.get('DOCKER_TLS_VERIFY') + tls_verify = environment.get('DOCKER_TLS_VERIFY') if tls_verify == '': tls_verify = False else: -- cgit v1.2.1