diff options
| author | Joffrey F <joffrey@docker.com> | 2015-08-26 17:02:24 -0700 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2015-08-26 17:02:24 -0700 |
| commit | e8af8b376dd9383a1db4185fea5705c2cb2d8add (patch) | |
| tree | 3940665672501d4839f60f9a83b529bab64a71e2 | |
| parent | c56c9faacd6cf5118f71cd615f57a83f5a05cb20 (diff) | |
| download | docker-py-e8af8b376dd9383a1db4185fea5705c2cb2d8add.tar.gz | |
Use cross-platform home directory path
| -rw-r--r-- | docker/utils/utils.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/docker/utils/utils.py b/docker/utils/utils.py index d659ca4..8dc726b 100644 --- a/docker/utils/utils.py +++ b/docker/utils/utils.py @@ -114,7 +114,7 @@ def exclude_paths(root, patterns, dockerfile=None): components = p.split('/') paths += [ '/'.join(components[:end]) - for end in range(1, len(components)+1) + for end in range(1, len(components) + 1) ] return set(paths) @@ -369,8 +369,7 @@ def kwargs_from_env(ssl_version=None, assert_hostname=None): if tls_verify else host) if tls_verify and not cert_path: - if 'HOME' in os.environ: - cert_path = os.path.join(os.environ['HOME'], '.docker') + cert_path = os.path.join(os.path.expanduser('~'), '.docker') if tls_verify and cert_path: params['tls'] = tls.TLSConfig( |
