Updated websocket-client dependency to latest version (now supports python 3)

4 files changed, 4 insertions, 11 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
diff --git a/requirements.txt b/requirements.txt
index a1c3aa5..b23ea48 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
 requests==2.5.3
 six>=1.3.0
-websocket-client==0.11.0
+websocket-client==0.32.0
diff --git a/requirements3.txt b/requirements3.txt
deleted file mode 100644
index 9666476..0000000
--- a/requirements3.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-requests==2.5.3
-six>=1.3.0
diff --git a/setup.py b/setup.py
index 6000e6f..485d33c 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ requirements = [
 ]
 
 if sys.version_info[0] < 3:
-    requirements.append('websocket-client >= 0.11.0')
+    requirements.append('websocket-client >= 0.32.0')
 
 exec(open('docker/version.py').read())