Merge pull request #411 from docker/393-enforce-str-version

Enforce passing string as version param in ctor

2 files changed, 17 insertions, 0 deletions

diff --git a/docker/client.py b/docker/client.py
index 5ba9003..93f4bd7 100644
--- a/docker/client.py
+++ b/docker/client.py
@@ -50,6 +50,12 @@ class Client(requests.Session):
             raise errors.TLSParameterError(
                 'If using TLS, the base_url argument must begin with '
                 '"https://".')
+        if not isinstance(version, six.string_types):
+            raise errors.DockerException(
+                'version parameter must be a string. Found {0}'.format(
+                    type(version).__name__
+                )
+            )
         self.base_url = base_url
         self._version = version
         self._timeout = timeout
diff --git a/tests/test.py b/tests/test.py
index c9a1b05..38cbc2f 100644
--- a/tests/test.py
+++ b/tests/test.py
@@ -102,6 +102,17 @@ class DockerClientTest(Cleanup, unittest.TestCase):
     def tearDown(self):
         self.client.close()
 
+    def test_ctor(self):
+        try:
+            docker.Client(version=1.12)
+        except Exception as e:
+            self.assertTrue(isinstance(e, docker.errors.DockerException))
+            if not six.PY3:
+                self.assertEqual(
+                    e.message,
+                    'version parameter must be a string. Found float'
+                )
+
     #########################
     #   INFORMATION TESTS   #
     #########################