Merge pull request #69 from ytjohn/version_prefix

adding configurable version_prefix

Author: lavagetto

README.rst

@@ -41,7 +41,8 @@ Create a client object
     client = etcd.Client(port=4002)
     client = etcd.Client(host='127.0.0.1', port=4003)
     client = etcd.Client(host='127.0.0.1', port=4003, allow_redirect=False) # wont let you run sensitive commands on non-leader machines, default is true
-
+    # create a client against https://api.example.com:443/etcd
+    client = etcd.Client(host='api.example.com', protocol='https', port=443, version_prefix='/etcd')
 Write a key
 ~~~~~~~~~
 

src/etcd/client.py

@@ -30,6 +30,7 @@ def __init__(
             self,
             host='127.0.0.1',
             port=4001,
+            version_prefix='/v2',
             read_timeout=60,
             allow_redirect=True,
             protocol='http',
@@ -47,6 +48,8 @@ def __init__(
 
             port (int):  Port used to connect to etcd.
 
+            version_prefix (str): Url or version prefix in etcd url (default=/v2).
+
             read_timeout (int):  max seconds to wait for a read.
 
             allow_redirect (bool): allow the client to connect to other nodes.
@@ -81,7 +84,7 @@ def uri(protocol, host, port):
 
         self._base_uri = uri(self._protocol, self._host, self._port)
 
-        self.version_prefix = '/v2'
+        self.version_prefix = version_prefix
 
         self._read_timeout = read_timeout
         self._allow_redirect = allow_redirect

src/etcd/tests/unit/test_client.py

@@ -19,6 +19,10 @@ def test_default_port(self):
         client = etcd.Client()
         assert client.port == 4001
 
+    def test_default_prefix(self):
+        client = etcd.Client()
+        assert client.version_prefix == '/v2'
+
     def test_default_protocol(self):
         """ default protocol is http"""
         client = etcd.Client()
@@ -44,6 +48,10 @@ def test_set_port(self):
         client = etcd.Client(port=4002)
         assert client.port == 4002
 
+    def test_default_prefix(self):
+        client = etcd.Client(version_prefix='/etcd')
+        assert client.version_prefix == '/etcd'
+
     def test_set_protocol(self):
         """ can change protocol """
         client = etcd.Client(protocol='https')