From 7970d6b7ad726820f08d3f1d284b5133416dc45f Mon Sep 17 00:00:00 2001
From: ibrahim <ibrahimmenem@gmail.com>
Date: Thu, 1 Feb 2018 21:58:27 +0100
Subject: [PATCH 1/5] Add nodemeta to catalog and health end points

---
 consul/base.py | 42 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/consul/base.py b/consul/base.py
index 09203b6d..d13124a6 100755
--- a/consul/base.py
+++ b/consul/base.py
@@ -1182,7 +1182,8 @@ def nodes(
                 consistency=None,
                 dc=None,
                 near=None,
-                token=None):
+                token=None,
+                node_meta=None):
             """
             Returns a tuple of (*index*, *nodes*) of all nodes known
             about in the *dc* datacenter. *dc* defaults to the current
@@ -1204,6 +1205,9 @@ def nodes(
 
             *token* is an optional `ACL token`_ to apply to this request.
 
+            *node_meta* is an optional meta data used for filtering, a string
+            formatted as 'key:value'.
+
             The response looks like this::
 
                 (index, [
@@ -1233,6 +1237,9 @@ def nodes(
             consistency = consistency or self.agent.consistency
             if consistency in ('consistent', 'stale'):
                 params[consistency] = '1'
+            if node_meta:
+                params['node-meta'] = node_meta
+
             return self.agent.http.get(
                 CB.json(index=True), '/v1/catalog/nodes', params=params)
 
@@ -1241,7 +1248,8 @@ def services(self,
                      wait=None,
                      consistency=None,
                      dc=None,
-                     token=None):
+                     token=None,
+                     node_meta=None):
             """
             Returns a tuple of (*index*, *services*) of all services known
             about in the *dc* datacenter. *dc* defaults to the current
@@ -1260,6 +1268,9 @@ def services(self,
 
             *token* is an optional `ACL token`_ to apply to this request.
 
+            *node_meta* is an optional meta data used for filtering, a string
+            formatted as 'key:value'.
+
             The response looks like this::
 
                 (index, {
@@ -1288,6 +1299,9 @@ def services(self,
             consistency = consistency or self.agent.consistency
             if consistency in ('consistent', 'stale'):
                 params[consistency] = '1'
+            if node_meta:
+                params['node-meta'] = node_meta
+
             return self.agent.http.get(
                 CB.json(index=True), '/v1/catalog/services', params=params)
 
@@ -1445,7 +1459,8 @@ def service(self,
                     tag=None,
                     dc=None,
                     near=None,
-                    token=None):
+                    token=None,
+                    node_meta=None):
             """
             Returns a tuple of (*index*, *nodes*)
 
@@ -1470,6 +1485,9 @@ def service(self,
             order based on the estimated round trip time from that node
 
             *token* is an optional `ACL token`_ to apply to this request.
+
+            *node_meta* is an optional meta data used for filtering, a string
+            formatted as 'key:value'.
             """
             params = {}
             if index:
@@ -1488,6 +1506,8 @@ def service(self,
             token = token or self.agent.token
             if token:
                 params['token'] = token
+            if node_meta:
+                params['node-meta'] = node_meta
 
             return self.agent.http.get(
                 CB.json(index=True),
@@ -1501,7 +1521,8 @@ def checks(
                 wait=None,
                 dc=None,
                 near=None,
-                token=None):
+                token=None,
+                node_meta=None):
             """
             Returns a tuple of (*index*, *checks*) with *checks* being the
             checks associated with the service.
@@ -1522,6 +1543,9 @@ def checks(
             order based on the estimated round trip time from that node
 
             *token* is an optional `ACL token`_ to apply to this request.
+
+            *node_meta* is an optional meta data used for filtering, a string
+            formatted as 'key:value'.
             """
             params = {}
             if index:
@@ -1536,6 +1560,8 @@ def checks(
             token = token or self.agent.token
             if token:
                 params['token'] = token
+            if node_meta:
+                params['node-meta'] = node_meta
 
             return self.agent.http.get(
                 CB.json(index=True),
@@ -1548,7 +1574,8 @@ def state(self,
                   wait=None,
                   dc=None,
                   near=None,
-                  token=None):
+                  token=None,
+                  node_meta=None):
             """
             Returns a tuple of (*index*, *nodes*)
 
@@ -1573,6 +1600,9 @@ def state(self,
 
             *token* is an optional `ACL token`_ to apply to this request.
 
+            *node_meta* is an optional meta data used for filtering, a string
+            formatted as 'key:value'.
+
             *nodes* are the nodes providing the given service.
             """
             assert name in ['any', 'unknown', 'passing', 'warning', 'critical']
@@ -1589,6 +1619,8 @@ def state(self,
             token = token or self.agent.token
             if token:
                 params['token'] = token
+            if node_meta:
+                params['node-meta'] = node_meta
 
             return self.agent.http.get(
                 CB.json(index=True),

From 726c1135143564a9aca08ac2f248f2e7f5dd25d6 Mon Sep 17 00:00:00 2001
From: ibrahim <ibrahimmenem@gmail.com>
Date: Fri, 2 Feb 2018 21:19:02 +0100
Subject: [PATCH 2/5] pin pytest-twisted to version 1.5

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 1a97df92..75f2a8f4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ exclude = .tox/*,xx/*,__*,docs,*aio.py
 [testenv]
 deps =
     pytest
-    pytest-twisted
+    pytest-twisted==1.5
     pytest-rerunfailures
     tornado
     twisted

From 881a2d654b2d60bc3647df10b9428d16e6b460f9 Mon Sep 17 00:00:00 2001
From: ibrahim <ibrahimmenem@gmail.com>
Date: Fri, 2 Feb 2018 21:27:08 +0100
Subject: [PATCH 3/5] pin pytest-twisted for all python versions

---
 tox.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tox.ini b/tox.ini
index 75f2a8f4..3eb274d9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,7 +28,7 @@ commands =
 deps =
     pytest
     pytest-rerunfailures
-    pytest-twisted
+    pytest-twisted==1.5
     twisted
     treq
     pyOpenSSL
@@ -43,7 +43,7 @@ commands =
 deps =
     pytest
     pytest-rerunfailures
-    pytest-twisted
+    pytest-twisted==1.5
     twisted
     treq
     pyOpenSSL
@@ -58,7 +58,7 @@ commands =
 deps =
     pytest
     pytest-rerunfailures
-    pytest-twisted
+    pytest-twisted==1.5
     twisted
     treq
     pyOpenSSL

From bb2647b271a28680c313cec015f1c09d63a803ca Mon Sep 17 00:00:00 2001
From: ibrahim <ibrahimmenem@gmail.com>
Date: Fri, 22 Jun 2018 23:40:13 +0200
Subject: [PATCH 4/5] Rewrite params to be in form of list of two-element
 tuples

change `node_meta` from string to dict
---
 consul/base.py     | 355 +++++++++++++++++++++++----------------------
 tests/test_base.py |  20 +--
 2 files changed, 190 insertions(+), 185 deletions(-)

diff --git a/consul/base.py b/consul/base.py
index 3ca64c76..569abbb3 100755
--- a/consul/base.py
+++ b/consul/base.py
@@ -386,16 +386,16 @@ def fire(
             """
             assert not name.startswith('/'), \
                 'keys should not start with a forward slash'
-            params = {}
+            params = []
             if node is not None:
-                params['node'] = node
+                params.append(('node', node))
             if service is not None:
-                params['service'] = service
+                params.append(('service', service))
             if tag is not None:
-                params['tag'] = tag
+                params.append(('tag', tag))
             token = token or self.agent.token
             if token:
-                params['token'] = token
+                params.append(('token', token))
 
             return self.agent.http.put(
                 CB.json(),
@@ -441,11 +441,11 @@ def list(
                       },
                 }
             """
-            params = {}
+            params = []
             if name is not None:
-                params['name'] = name
+                params.append(('name', name))
             if index:
-                params['index'] = index
+                params.append(('index', index))
                 if wait:
                     params['wait'] = wait
             return self.agent.http.get(
@@ -513,26 +513,26 @@ def get(
             """
             assert not key.startswith('/'), \
                 'keys should not start with a forward slash'
-            params = {}
+            params = []
             if index:
-                params['index'] = index
+                params.append(('index', index))
                 if wait:
-                    params['wait'] = wait
+                    params.append(('wait', wait))
             if recurse:
-                params['recurse'] = '1'
+                params.append(('recurse', '1'))
             token = token or self.agent.token
             if token:
-                params['token'] = token
+                params.append(('token', token))
             dc = dc or self.agent.dc
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
             if keys:
-                params['keys'] = True
+                params.append(('keys', True))
             if separator:
-                params['separator'] = separator
+                params.append(('separator', separator))
             consistency = consistency or self.agent.consistency
             if consistency in ('consistent', 'stale'):
-                params[consistency] = '1'
+                params.append((consistency, '1'))
 
             one = False
             decode = False
@@ -595,21 +595,21 @@ def put(
                 isinstance(value, (six.string_types, six.binary_type)), \
                 "value should be None or a string / binary data"
 
-            params = {}
+            params = []
             if cas is not None:
-                params['cas'] = cas
+                params.append(('cas', cas))
             if flags is not None:
-                params['flags'] = flags
+                params.append(('flags', flags))
             if acquire:
-                params['acquire'] = acquire
+                params.append(('acquire', acquire))
             if release:
-                params['release'] = release
+                params.append(('release', release))
             token = token or self.agent.token
             if token:
-                params['token'] = token
+                params.append(('token', token))
             dc = dc or self.agent.dc
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
             return self.agent.http.put(
                 CB.json(), '/v1/kv/%s' % key, params=params, data=value)
 
@@ -635,17 +635,17 @@ def delete(self, key, recurse=None, cas=None, token=None, dc=None):
             assert not key.startswith('/'), \
                 'keys should not start with a forward slash'
 
-            params = {}
+            params = []
             if recurse:
-                params['recurse'] = '1'
+                params.append(('recurse', '1'))
             if cas is not None:
-                params['cas'] = cas
+                params.append(('cas', cas))
             token = token or self.agent.token
             if token:
-                params['token'] = token
+                params.append(('token', token))
             dc = dc or self.agent.dc
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
 
             return self.agent.http.delete(
                 CB.json(), '/v1/kv/%s' % key, params=params)
@@ -737,9 +737,9 @@ def members(self, wan=False):
             the list of WAN members instead of the LAN members which is
             default.
             """
-            params = {}
+            params = []
             if wan:
-                params['wan'] = 1
+                params.append(('wan', 1))
             return self.agent.http.get(
                 CB.json(), '/v1/agent/members', params=params)
 
@@ -755,11 +755,11 @@ def maintenance(self, enable, reason=None):
             operators.
             """
 
-            params = {}
+            params = []
 
-            params['enable'] = enable
+            params.append(('enable', enable))
             if reason:
-                params['reason'] = reason
+                params.append(('reason', reason))
 
             return self.agent.http.put(
                 CB.bool(), '/v1/agent/maintenance', params=params)
@@ -776,10 +776,10 @@ def join(self, address, wan=False):
             pool. Default is 'false'.
             """
 
-            params = {}
+            params = []
 
             if wan:
-                params['wan'] = 1
+                params.append(('wan', 1))
 
             return self.agent.http.get(
                 CB.bool(), '/v1/agent/join/%s' % address, params=params)
@@ -878,10 +878,10 @@ def register(
                         http=http,
                         timeout=timeout))
 
-                params = {}
+                params = []
                 token = token or self.agent.token
                 if token:
-                    params['token'] = token
+                    params.append(('token', token))
 
                 return self.agent.http.put(
                     CB.bool(),
@@ -913,11 +913,11 @@ def maintenance(self, service_id, enable, reason=None):
                 operators.
                 """
 
-                params = {}
+                params = []
 
-                params['enable'] = enable
+                params.append(('enable', enable))
                 if reason:
-                    params['reason'] = reason
+                    params.append(('reason', reason))
 
                 return self.agent.http.put(
                     CB.bool(),
@@ -993,10 +993,11 @@ def register(
                 if service_id:
                     payload['serviceid'] = service_id
 
-                params = {}
+                params = []
                 token = token or self.agent.token
                 if token:
-                    params['token'] = token
+                    params.append(('token', token))
+
 
                 return self.agent.http.put(
                     CB.bool(),
@@ -1017,9 +1018,9 @@ def ttl_pass(self, check_id, notes=None):
                 Mark a ttl based check as passing. Optional notes can be
                 attached to describe the status of the check.
                 """
-                params = {}
+                params = []
                 if notes:
-                    params['note'] = notes
+                    params.append(('note', notes))
 
                 return self.agent.http.put(
                     CB.bool(),
@@ -1032,9 +1033,9 @@ def ttl_fail(self, check_id, notes=None):
                 attached to describe why check is failing. The status of the
                 check will be set to critical and the ttl clock will be reset.
                 """
-                params = {}
+                params = []
                 if notes:
-                    params['note'] = notes
+                    params.append(('note', notes))
 
                 return self.agent.http.put(
                     CB.bool(),
@@ -1047,9 +1048,9 @@ def ttl_warn(self, check_id, notes=None):
                 attached to describe the warning. The status of the
                 check will be set to warn and the ttl clock will be reset.
                 """
-                params = {}
+                params = []
                 if notes:
-                    params['note'] = notes
+                    params.append(('note', notes))
 
                 return self.agent.http.put(
                     CB.bool(),
@@ -1123,7 +1124,7 @@ def register(self,
             Returns *True* on success.
             """
             data = {'node': node, 'address': address}
-            params = {}
+            params = []
             dc = dc or self.agent.dc
             if dc:
                 data['datacenter'] = dc
@@ -1134,7 +1135,7 @@ def register(self,
             token = token or self.agent.token
             if token:
                 data['WriteRequest'] = {'Token': token}
-                params['token'] = token
+                params.append(('token', token))
             return self.agent.http.put(
                 CB.bool(),
                 '/v1/catalog/register',
@@ -1214,8 +1215,8 @@ def nodes(
 
             *token* is an optional `ACL token`_ to apply to this request.
 
-            *node_meta* is an optional meta data used for filtering, a string
-            formatted as 'key:value'.
+            *node_meta* is an optional meta data used for filtering, a
+            dictionary formatted as {k1:v1, k2:v2}.
 
             The response looks like this::
 
@@ -1230,24 +1231,25 @@ def nodes(
                     }
                 ])
             """
-            params = {}
+            params = []
             dc = dc or self.agent.dc
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
             if index:
-                params['index'] = index
+                params.append(('index', index))
                 if wait:
-                    params['wait'] = wait
+                    params.append(('wait', wait))
             if near:
-                params['near'] = near
+                params.append(('near', near))
             token = token or self.agent.token
             if token:
-                params['token'] = token
+                params.append(('token', token))
             consistency = consistency or self.agent.consistency
             if consistency in ('consistent', 'stale'):
-                params[consistency] = '1'
+                params.append((consistency, '1'))
             if node_meta:
-                params['node-meta'] = node_meta
+                for nodemeta_name, nodemeta_value in node_meta.items():
+                    params.append(('node-meta', '{}:{}'.format(nodemeta_name, nodemeta_value)))
 
             return self.agent.http.get(
                 CB.json(index=True), '/v1/catalog/nodes', params=params)
@@ -1277,8 +1279,8 @@ def services(self,
 
             *token* is an optional `ACL token`_ to apply to this request.
 
-            *node_meta* is an optional meta data used for filtering, a string
-            formatted as 'key:value'.
+            *node_meta* is an optional meta data used for filtering, a
+            dictionary formatted as {k1:v1, k2:v2}.
 
             The response looks like this::
 
@@ -1294,22 +1296,23 @@ def services(self,
             The main keys are the service names and the list provides all the
             known tags for a given service.
             """
-            params = {}
+            params = []
             dc = dc or self.agent.dc
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
             if index:
-                params['index'] = index
+                params.append(('index', index))
                 if wait:
-                    params['wait'] = wait
+                    params.append(('wait', wait))
             token = token or self.agent.token
             if token:
-                params['token'] = token
+                params.append(('token', token))
             consistency = consistency or self.agent.consistency
             if consistency in ('consistent', 'stale'):
-                params[consistency] = '1'
+                params.append((consistency, '1'))
             if node_meta:
-                params['node-meta'] = node_meta
+                for nodemeta_name, nodemeta_value in node_meta.items():
+                    params.append(('node-meta', '{}:{}'.format(nodemeta_name, nodemeta_value)))
 
             return self.agent.http.get(
                 CB.json(index=True), '/v1/catalog/services', params=params)
@@ -1366,20 +1369,20 @@ def node(self,
                     }
                 })
             """
-            params = {}
+            params = []
             dc = dc or self.agent.dc
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
             if index:
-                params['index'] = index
+                params.append(('index', index))
                 if wait:
-                    params['wait'] = wait
+                    params.append(('wait', wait))
             token = token or self.agent.token
             if token:
                 params['token'] = token
             consistency = consistency or self.agent.consistency
             if consistency in ('consistent', 'stale'):
-                params[consistency] = '1'
+                params.append((consistency, '1'))
             return self.agent.http.get(
                 CB.json(index=True),
                 '/v1/catalog/node/%s' % node,
@@ -1432,24 +1435,24 @@ def service(
                     }
                 ])
             """
-            params = {}
+            params = []
             dc = dc or self.agent.dc
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
             if tag:
-                params['tag'] = tag
+                params.append(('tag', tag))
             if index:
-                params['index'] = index
+                params.append(('index', index))
                 if wait:
-                    params['wait'] = wait
+                    params.append(('wait', wait))
             if near:
-                params['near'] = near
+                params.append(('near', near))
             token = token or self.agent.token
             if token:
-                params['token'] = token
+                params.append(('token', token))
             consistency = consistency or self.agent.consistency
             if consistency in ('consistent', 'stale'):
-                params[consistency] = '1'
+                params.append((consistency, '1'))
             return self.agent.http.get(
                 CB.json(index=True),
                 '/v1/catalog/service/%s' % service,
@@ -1495,28 +1498,29 @@ def service(self,
 
             *token* is an optional `ACL token`_ to apply to this request.
 
-            *node_meta* is an optional meta data used for filtering, a string
-            formatted as 'key:value'.
+            *node_meta* is an optional meta data used for filtering, a
+            dictionary formatted as {k1:v1, k2:v2}.
             """
-            params = {}
+            params = []
             if index:
-                params['index'] = index
+                params.append(('index', index))
                 if wait:
-                    params['wait'] = wait
+                    params.append(('wait', wait))
             if passing:
-                params['passing'] = '1'
+                params.append(('passing', '1'))
             if tag is not None:
-                params['tag'] = tag
+                params.append(('tag', tag))
             dc = dc or self.agent.dc
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
             if near:
-                params['near'] = near
+                params.append(('near', near))
             token = token or self.agent.token
             if token:
-                params['token'] = token
+                params.append(('token', token))
             if node_meta:
-                params['node-meta'] = node_meta
+                for nodemeta_name, nodemeta_value in node_meta.items():
+                    params.append(('node-meta', '{}:{}'.format(nodemeta_name, nodemeta_value)))
 
             return self.agent.http.get(
                 CB.json(index=True),
@@ -1553,24 +1557,25 @@ def checks(
 
             *token* is an optional `ACL token`_ to apply to this request.
 
-            *node_meta* is an optional meta data used for filtering, a string
-            formatted as 'key:value'.
+            *node_meta* is an optional meta data used for filtering, a
+            dictionary formatted as {k1:v1, k2:v2}.
             """
-            params = {}
+            params = []
             if index:
-                params['index'] = index
+                params.append(('index', index))
                 if wait:
-                    params['wait'] = wait
+                    params.append(('wait', wait))
             dc = dc or self.agent.dc
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
             if near:
-                params['near'] = near
+                params.append(('near', near))
             token = token or self.agent.token
             if token:
-                params['token'] = token
+                params.append(('token', token))
             if node_meta:
-                params['node-meta'] = node_meta
+                for nodemeta_name, nodemeta_value in node_meta.items():
+                    params.append(('node-meta', '{}:{}'.format(nodemeta_name, nodemeta_value)))
 
             return self.agent.http.get(
                 CB.json(index=True),
@@ -1609,28 +1614,28 @@ def state(self,
 
             *token* is an optional `ACL token`_ to apply to this request.
 
-            *node_meta* is an optional meta data used for filtering, a string
-            formatted as 'key:value'.
+            *node_meta* is an optional meta data used for filtering, a
+            dictionary formatted as {k1:v1, k2:v2}.
 
             *nodes* are the nodes providing the given service.
             """
             assert name in ['any', 'unknown', 'passing', 'warning', 'critical']
-            params = {}
+            params = []
             if index:
-                params['index'] = index
+                params.append(('index', index))
                 if wait:
-                    params['wait'] = wait
+                    params.append(('wait', wait))
             dc = dc or self.agent.dc
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
             if near:
-                params['near'] = near
+                params.append(('near', near))
             token = token or self.agent.token
             if token:
-                params['token'] = token
+                params.append(('token', token))
             if node_meta:
-                params['node-meta'] = node_meta
-
+                for nodemeta_name, nodemeta_value in node_meta.items():
+                    params.append(('node-meta', '{}:{}'.format(nodemeta_name, nodemeta_value)))
             return self.agent.http.get(
                 CB.json(index=True),
                 '/v1/health/state/%s' % name,
@@ -1654,17 +1659,17 @@ def node(self, node, index=None, wait=None, dc=None, token=None):
 
             *nodes* are the nodes providing the given service.
             """
-            params = {}
+            params = []
             if index:
-                params['index'] = index
+                params.append(('index', index))
                 if wait:
-                    params['wait'] = wait
+                    params.append(('wait', wait))
             dc = dc or self.agent.dc
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
             token = token or self.agent.token
             if token:
-                params['token'] = token
+                params.append(('token', token))
 
             return self.agent.http.get(
                 CB.json(index=True),
@@ -1716,10 +1721,10 @@ def create(
 
             Returns the string *session_id* for the session.
             """
-            params = {}
+            params = []
             dc = dc or self.agent.dc
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
             data = {}
             if name:
                 data['name'] = name
@@ -1753,10 +1758,10 @@ def destroy(self, session_id, dc=None):
 
             Returns *True* on success.
             """
-            params = {}
+            params = []
             dc = dc or self.agent.dc
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
             return self.agent.http.put(
                 CB.bool(),
                 '/v1/session/destroy/%s' % session_id,
@@ -1794,17 +1799,17 @@ def list(self, index=None, wait=None, consistency=None, dc=None):
                   ...
                ])
             """
-            params = {}
+            params = []
             dc = dc or self.agent.dc
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
             if index:
-                params['index'] = index
+                params.append(('index', index))
                 if wait:
-                    params['wait'] = wait
+                    params.append(('wait', wait))
             consistency = consistency or self.agent.consistency
             if consistency in ('consistent', 'stale'):
-                params[consistency] = '1'
+                params.append((consistency, '1'))
             return self.agent.http.get(
                 CB.json(index=True), '/v1/session/list', params=params)
 
@@ -1824,17 +1829,17 @@ def node(self, node, index=None, wait=None, consistency=None, dc=None):
             not specified *consistency* will the consistency level this client
             was configured with.
             """
-            params = {}
+            params = []
             dc = dc or self.agent.dc
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
             if index:
-                params['index'] = index
+                params.append(('index', index))
                 if wait:
-                    params['wait'] = wait
+                    params.append(('wait', wait))
             consistency = consistency or self.agent.consistency
             if consistency in ('consistent', 'stale'):
-                params[consistency] = '1'
+                params.append((consistency, '1'))
             return self.agent.http.get(
                 CB.json(index=True),
                 '/v1/session/node/%s' % node, params=params)
@@ -1861,17 +1866,17 @@ def info(self,
             not specified *consistency* will the consistency level this client
             was configured with.
             """
-            params = {}
+            params = []
             dc = dc or self.agent.dc
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
             if index:
-                params['index'] = index
+                params.append(('index', index))
                 if wait:
-                    params['wait'] = wait
+                    params.append(('wait', wait))
             consistency = consistency or self.agent.consistency
             if consistency in ('consistent', 'stale'):
-                params[consistency] = '1'
+                params.append((consistency, '1'))
             return self.agent.http.get(
                 CB.json(index=True, one=True),
                 '/v1/session/info/%s' % session_id,
@@ -1887,10 +1892,10 @@ def renew(self, session_id, dc=None):
 
             Returns the session.
             """
-            params = {}
+            params = []
             dc = dc or self.agent.dc
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
             return self.agent.http.put(
                 CB.json(one=True, allow_404=False),
                 '/v1/session/renew/%s' % session_id,
@@ -1907,10 +1912,10 @@ def list(self, token=None):
             default token.  An *ACLPermissionDenied* exception will be raised
             if a management token is not used.
             """
-            params = {}
+            params = []
             token = token or self.agent.token
             if token:
-                params['token'] = token
+                params.append(('token', token))
             return self.agent.http.get(
                 CB.json(), '/v1/acl/list', params=params)
 
@@ -1918,10 +1923,10 @@ def info(self, acl_id, token=None):
             """
             Returns the token information for *acl_id*.
             """
-            params = {}
+            params = []
             token = token or self.agent.token
             if token:
-                params['token'] = token
+                params.append(('token', token))
             return self.agent.http.get(
                 CB.json(one=True), '/v1/acl/info/%s' % acl_id, params=params)
 
@@ -1963,10 +1968,10 @@ def create(self,
 
             Returns the string *acl_id* for the new token.
             """
-            params = {}
+            params = []
             token = token or self.agent.token
             if token:
-                params['token'] = token
+                params.append(('token', token))
 
             payload = {}
             if name:
@@ -2012,10 +2017,10 @@ def update(self, acl_id, name=None, type=None, rules=None, token=None):
 
             Returns the string *acl_id* of this token on success.
             """
-            params = {}
+            params = []
             token = token or self.agent.token
             if token:
-                params['token'] = token
+                params.append(('token', token))
 
             payload = {'ID': acl_id}
             if name:
@@ -2046,10 +2051,10 @@ def clone(self, acl_id, token=None):
 
             Returns the string of the newly created *acl_id*.
             """
-            params = {}
+            params = []
             token = token or self.agent.token
             if token:
-                params['token'] = token
+                params.append(('token', token))
             return self.agent.http.put(
                 CB.json(is_id=True),
                 '/v1/acl/clone/%s' % acl_id,
@@ -2064,10 +2069,10 @@ def destroy(self, acl_id, token=None):
 
             Returns *True* on success.
             """
-            params = {}
+            params = []
             token = token or self.agent.token
             if token:
-                params['token'] = token
+                params.append(('token', token))
             return self.agent.http.put(
                 CB.json(),
                 '/v1/acl/destroy/%s' % acl_id,
@@ -2110,12 +2115,12 @@ def list(self, dc=None, token=None):
 
             *token* is an optional `ACL token`_ to apply to this request.
             """
-            params = {}
+            params = []
             token = token or self.agent.token
             if token:
-                params['token'] = token
+                params.append(('token', token))
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
 
             return self.agent.http.get(CB.json(), '/v1/query', params=params)
 
@@ -2214,7 +2219,7 @@ def create(self, service,
             https://www.consul.io/docs/agent/http/query.html
             """
             path = '/v1/query'
-            params = None if dc is None else {'dc': dc}
+            params = None if dc is None else [('dc', dc)]
             data = self._query_data(
                 service, name, session, token, nearestn, datacenters,
                 onlypassing, tags, ttl, regexp
@@ -2242,7 +2247,7 @@ def update(self, query_id,
             all the other setting remains the same as the query create method
             """
             path = '/v1/query/%s' % query_id
-            params = None if dc is None else {'dc': dc}
+            params = None if dc is None else [('dc', dc)]
             data = self._query_data(
                 service, name, session, token, nearestn, datacenters,
                 onlypassing, tags, ttl, regexp
@@ -2264,12 +2269,12 @@ def get(self,
             *dc* is the datacenter that this agent will communicate with. By
             default the datacenter of the host is used.
             """
-            params = {}
+            params = []
             token = token or self.agent.token
             if token:
-                params['token'] = token
+                params.append(('token', token))
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
             return self.agent.http.get(
                 CB.json(), '/v1/query/%s' % query_id, params=params)
 
@@ -2284,12 +2289,12 @@ def delete(self, query_id, token=None, dc=None):
             *dc* is the datacenter that this agent will communicate with. By
             default the datacenter of the host is used.
             """
-            params = {}
+            params = []
             token = token or self.agent.token
             if token:
-                params['token'] = token
+                params.append(('token', token))
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
             return self.agent.http.delete(
                 CB.bool(), '/v1/query/%s' % query_id, params=params)
 
@@ -2315,16 +2320,16 @@ def execute(self,
             *limit* is used to limit the size of the list to the given number
             of nodes. This is applied after any sorting or shuffling.
             """
-            params = {}
+            params = []
             token = token or self.agent.token
             if token:
-                params['token'] = token
+                params.append(('token', token))
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
             if near:
-                params['near'] = near
+                params.append(('near', near))
             if limit:
-                params['limit'] = limit
+                params.append(('limit', limit))
             return self.agent.http.get(
                 CB.json(), '/v1/query/%s/execute' % query, params=params)
 
@@ -2342,12 +2347,12 @@ def explain(self,
             *dc* is the datacenter that this agent will communicate with. By
             default the datacenter of the host is used.
             """
-            params = {}
+            params = []
             token = token or self.agent.token
             if token:
-                params['token'] = token
+                params.append(('token', token))
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
             return self.agent.http.get(
                 CB.json(), '/v1/query/%s/explain' % query, params=params)
 
@@ -2378,16 +2383,16 @@ def nodes(self, dc=None, index=None, wait=None, consistency=None):
             not specified *consistency* will the consistency level this client
             was configured with.
             """
-            params = {}
+            params = []
             if dc:
-                params['dc'] = dc
+                params.append(('dc', dc))
             if index:
-                params['index'] = index
+                params.append(('index', index))
                 if wait:
-                    params['wait'] = wait
+                    params.append(('wait', wait))
             consistency = consistency or self.agent.consistency
             if consistency in ('consistent', 'stale'):
-                params[consistency] = '1'
+                params.append((consistency, '1'))
             return self.agent.http.get(
                 CB.json(index=True), '/v1/coordinate/nodes', params=params)
 
diff --git a/tests/test_base.py b/tests/test_base.py
index 44e0bc79..33db422c 100755
--- a/tests/test_base.py
+++ b/tests/test_base.py
@@ -55,8 +55,8 @@ class TestIndex(object):
     def test_index(self):
         c = Consul()
         for r in _should_support(c):
-            assert r().params == {}
-            assert r(index='5').params == {'index': '5'}
+            assert r().params == []
+            assert r(index='5').params == [('index', '5')]
 
 
 class TestConsistency(object):
@@ -66,18 +66,18 @@ class TestConsistency(object):
     def test_explict(self):
         c = Consul()
         for r in _should_support(c):
-            assert r().params == {}
-            assert r(consistency='default').params == {}
-            assert r(consistency='consistent').params == {'consistent': '1'}
-            assert r(consistency='stale').params == {'stale': '1'}
+            assert r().params == []
+            assert r(consistency='default').params == []
+            assert r(consistency='consistent').params == [('consistent', '1')]
+            assert r(consistency='stale').params == [('stale', '1')]
 
     def test_implicit(self):
         c = Consul(consistency='consistent')
         for r in _should_support(c):
-            assert r().params == {'consistent': '1'}
-            assert r(consistency='default').params == {}
-            assert r(consistency='consistent').params == {'consistent': '1'}
-            assert r(consistency='stale').params == {'stale': '1'}
+            assert r().params == [('consistent', '1')]
+            assert r(consistency='default').params == []
+            assert r(consistency='consistent').params == [('consistent', '1')]
+            assert r(consistency='stale').params == [('stale', '1')]
 
 
 class TestCB(object):

From 0008ff3e9c2a85cb11ca630acdda385b29e59d71 Mon Sep 17 00:00:00 2001
From: ibrahim <ibrahimmenem@gmail.com>
Date: Fri, 22 Jun 2018 23:58:35 +0200
Subject: [PATCH 5/5] Remove pytest-twisted version pinning

fix style
---
 consul/base.py | 16 ++++++++++------
 tox.ini        |  6 +++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/consul/base.py b/consul/base.py
index 569abbb3..16489264 100755
--- a/consul/base.py
+++ b/consul/base.py
@@ -998,7 +998,6 @@ def register(
                 if token:
                     params.append(('token', token))
 
-
                 return self.agent.http.put(
                     CB.bool(),
                     '/v1/agent/check/register',
@@ -1249,7 +1248,8 @@ def nodes(
                 params.append((consistency, '1'))
             if node_meta:
                 for nodemeta_name, nodemeta_value in node_meta.items():
-                    params.append(('node-meta', '{}:{}'.format(nodemeta_name, nodemeta_value)))
+                    params.append(('node-meta', '{}:{}'.
+                                   format(nodemeta_name, nodemeta_value)))
 
             return self.agent.http.get(
                 CB.json(index=True), '/v1/catalog/nodes', params=params)
@@ -1312,7 +1312,8 @@ def services(self,
                 params.append((consistency, '1'))
             if node_meta:
                 for nodemeta_name, nodemeta_value in node_meta.items():
-                    params.append(('node-meta', '{}:{}'.format(nodemeta_name, nodemeta_value)))
+                    params.append(('node-meta', '{}:{}'.
+                                   format(nodemeta_name, nodemeta_value)))
 
             return self.agent.http.get(
                 CB.json(index=True), '/v1/catalog/services', params=params)
@@ -1520,7 +1521,8 @@ def service(self,
                 params.append(('token', token))
             if node_meta:
                 for nodemeta_name, nodemeta_value in node_meta.items():
-                    params.append(('node-meta', '{}:{}'.format(nodemeta_name, nodemeta_value)))
+                    params.append(('node-meta', '{}:{}'.
+                                   format(nodemeta_name, nodemeta_value)))
 
             return self.agent.http.get(
                 CB.json(index=True),
@@ -1575,7 +1577,8 @@ def checks(
                 params.append(('token', token))
             if node_meta:
                 for nodemeta_name, nodemeta_value in node_meta.items():
-                    params.append(('node-meta', '{}:{}'.format(nodemeta_name, nodemeta_value)))
+                    params.append(('node-meta', '{}:{}'.
+                                   format(nodemeta_name, nodemeta_value)))
 
             return self.agent.http.get(
                 CB.json(index=True),
@@ -1635,7 +1638,8 @@ def state(self,
                 params.append(('token', token))
             if node_meta:
                 for nodemeta_name, nodemeta_value in node_meta.items():
-                    params.append(('node-meta', '{}:{}'.format(nodemeta_name, nodemeta_value)))
+                    params.append(('node-meta', '{}:{}'.
+                                   format(nodemeta_name, nodemeta_value)))
             return self.agent.http.get(
                 CB.json(index=True),
                 '/v1/health/state/%s' % name,
diff --git a/tox.ini b/tox.ini
index f2f21a8d..4df9a5fc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ exclude = .tox/*,xx/*,__*,docs,*aio.py
 [testenv]
 deps =
     pytest
-    pytest-twisted==1.5
+    pytest-twisted
     pytest-rerunfailures
     tornado
     twisted
@@ -28,7 +28,7 @@ commands =
 deps =
     pytest
     pytest-rerunfailures
-    pytest-twisted==1.5
+    pytest-twisted
     twisted
     treq
     pyOpenSSL
@@ -43,7 +43,7 @@ commands =
 deps =
     pytest
     pytest-rerunfailures
-    pytest-twisted==1.5
+    pytest-twisted
     twisted
     treq
     pyOpenSSL