diff options
| author | Daniel Nephin <dnephin@gmail.com> | 2016-01-11 11:18:42 -0500 |
|---|---|---|
| committer | Daniel Nephin <dnephin@gmail.com> | 2016-01-11 11:18:42 -0500 |
| commit | e2878cbcc3a7eef99917adc1be252800b0e41ece (patch) | |
| tree | 3ad0ebbd651d5417d57387a8868d1b660de18ecf /docker | |
| parent | 62d9964cc1881f6f3cd021594cd40fd80a8fc855 (diff) | |
| parent | 6078040318547ca7a678b54cd420e034c21171ab (diff) | |
| download | docker-py-e2878cbcc3a7eef99917adc1be252800b0e41ece.tar.gz | |
Merge pull request #892 from docker/base_url_none
Don't break if base_url == None and TLS is enabled
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/client.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/client.py b/docker/client.py index d339f3b..e73adb8 100644 --- a/docker/client.py +++ b/docker/client.py @@ -45,7 +45,7 @@ class Client( timeout=constants.DEFAULT_TIMEOUT_SECONDS, tls=False): super(Client, self).__init__() - if tls and not base_url.startswith('https://'): + if tls and (not base_url or not base_url.startswith('https://')): raise errors.TLSParameterError( 'If using TLS, the base_url argument must begin with ' '"https://".') |