summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2014-11-26 23:14:19 +0100
committerJoffrey F <joffrey@docker.com>2014-11-26 23:14:19 +0100
commita9bc84cece547d101069afd195d1500f67e3a44a (patch)
tree138523304d30a029705dcf01ef58cb0362b88c4e
parent0012430b1bda8a7e16c58366624a733ba63712a8 (diff)
downloaddocker-py-393-enforce-str-version.tar.gz
Enforce passing string as version param in ctor393-enforce-str-version
-rw-r--r--docker/client.py6
-rw-r--r--tests/test.py11
2 files changed, 17 insertions, 0 deletions
diff --git a/docker/client.py b/docker/client.py
index de3bce6..06fa145 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 #
#########################