diff options
| author | Joffrey F <f.joffrey@gmail.com> | 2018-06-18 15:22:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-18 15:22:42 -0700 |
| commit | f70545e89a70bf396d5e46732af8df737190cab0 (patch) | |
| tree | 23a417ac42e3f661d39dbd23ebc7fb601c0250f0 /docker/transport/unixconn.py | |
| parent | e88751cb9a235f31ec946c199b952b69dcc4cc0b (diff) | |
| parent | e5f56247e3d6f6f0f325aab507d9845ad2c4c097 (diff) | |
| download | docker-py-3.4.0.tar.gz | |
Merge pull request #2062 from docker/3.4.0-release3.4.0
3.4.0 Release
Diffstat (limited to 'docker/transport/unixconn.py')
| -rw-r--r-- | docker/transport/unixconn.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/docker/transport/unixconn.py b/docker/transport/unixconn.py index cc35d00..c59821a 100644 --- a/docker/transport/unixconn.py +++ b/docker/transport/unixconn.py @@ -1,14 +1,10 @@ import six import requests.adapters import socket +from six.moves import http_client as httplib from .. import constants -if six.PY3: - import http.client as httplib -else: - import httplib - try: import requests.packages.urllib3 as urllib3 except ImportError: |