Skip to content

Commit 23df603

Browse files
committed
Make code compatible with python 2.6
1 parent b5b6100 commit 23df603

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

consul/base.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1141,7 +1141,7 @@ def register(self,
11411141
params.append(('token', token))
11421142
if node_meta:
11431143
for nodemeta_name, nodemeta_value in node_meta.items():
1144-
params.append(('node-meta', '{}:{}'.
1144+
params.append(('node-meta', '{0}:{1}'.
11451145
format(nodemeta_name, nodemeta_value)))
11461146
return self.agent.http.put(
11471147
CB.bool(),
@@ -1256,7 +1256,7 @@ def nodes(
12561256
params.append((consistency, '1'))
12571257
if node_meta:
12581258
for nodemeta_name, nodemeta_value in node_meta.items():
1259-
params.append(('node-meta', '{}:{}'.
1259+
params.append(('node-meta', '{0}:{1}'.
12601260
format(nodemeta_name, nodemeta_value)))
12611261

12621262
return self.agent.http.get(
@@ -1320,7 +1320,7 @@ def services(self,
13201320
params.append((consistency, '1'))
13211321
if node_meta:
13221322
for nodemeta_name, nodemeta_value in node_meta.items():
1323-
params.append(('node-meta', '{}:{}'.
1323+
params.append(('node-meta', '{0}:{1}'.
13241324
format(nodemeta_name, nodemeta_value)))
13251325

13261326
return self.agent.http.get(
@@ -1529,7 +1529,7 @@ def service(self,
15291529
params.append(('token', token))
15301530
if node_meta:
15311531
for nodemeta_name, nodemeta_value in node_meta.items():
1532-
params.append(('node-meta', '{}:{}'.
1532+
params.append(('node-meta', '{0}:{1}'.
15331533
format(nodemeta_name, nodemeta_value)))
15341534

15351535
return self.agent.http.get(
@@ -1585,7 +1585,7 @@ def checks(
15851585
params.append(('token', token))
15861586
if node_meta:
15871587
for nodemeta_name, nodemeta_value in node_meta.items():
1588-
params.append(('node-meta', '{}:{}'.
1588+
params.append(('node-meta', '{0}:{1}'.
15891589
format(nodemeta_name, nodemeta_value)))
15901590

15911591
return self.agent.http.get(
@@ -1646,7 +1646,7 @@ def state(self,
16461646
params.append(('token', token))
16471647
if node_meta:
16481648
for nodemeta_name, nodemeta_value in node_meta.items():
1649-
params.append(('node-meta', '{}:{}'.
1649+
params.append(('node-meta', '{0}:{1}'.
16501650
format(nodemeta_name, nodemeta_value)))
16511651
return self.agent.http.get(
16521652
CB.json(index=True),

tests/test_base.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ class TestNodemeta(object):
9898
"""
9999

100100
def test_node_meta(self):
101-
import sys
102101
c = Consul()
103102
for r in _should_support_node_meta(c):
104103
assert r().params == []

0 commit comments

Comments
 (0)