summaryrefslogtreecommitdiff
path: root/docker/client.py
diff options
context:
space:
mode:
Diffstat (limited to 'docker/client.py')
-rw-r--r--docker/client.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/docker/client.py b/docker/client.py
index 5781db6..f63da50 100644
--- a/docker/client.py
+++ b/docker/client.py
@@ -23,6 +23,8 @@ from datetime import datetime
import requests
import requests.exceptions
import six
+import websocket
+
from . import constants
from . import errors
@@ -33,10 +35,6 @@ from .utils import utils, check_resource
from .tls import TLSConfig
-if not six.PY3:
- import websocket
-
-
class Client(requests.Session):
def __init__(self, base_url=None, version=None,
timeout=constants.DEFAULT_TIMEOUT_SECONDS, tls=False):
@@ -154,9 +152,6 @@ class Client(requests.Session):
@check_resource
def _attach_websocket(self, container, params=None):
- if six.PY3:
- raise NotImplementedError("This method is not currently supported "
- "under python 3")
url = self._url("/containers/{0}/attach/ws".format(container))
req = requests.Request("POST", url, params=self._attach_params(params))
full_url = req.prepare().url