Fix a problem with mutable default arguments.

Also bump up the version of python-etcd in requirements to the
latest one that that does not have https://github.com/jplana/python-etcd/issues/152
This commit is contained in:
Oleksii Kliukin
2016-02-01 11:37:59 +01:00
parent a64c7abdcc
commit 2d457ae26a
3 changed files with 11 additions and 5 deletions
+9 -3
View File
@@ -168,7 +168,9 @@ def watching(w, watch, max_count=None, clear=True):
yield 0
def build_connect_parameters(conn_url, connect_parameters={}):
def build_connect_parameters(conn_url, connect_parameters=None):
if connect_parameters is None:
connect_parameters = {}
params = connect_parameters.copy()
parsed = parseurl(conn_url)
params['host'] = parsed['host']
@@ -200,7 +202,9 @@ def get_any_member(cluster, role='master', member=None):
return None
def get_cursor(cluster, role='master', member=None, connect_parameters={}):
def get_cursor(cluster, role='master', member=None, connect_parameters=None):
if connect_parameters is None:
connect_parameters = {}
member = get_any_member(cluster=cluster, role=role, member=member)
if member is None:
return None
@@ -314,7 +318,9 @@ def query(
cluster = dcs.get_cluster()
def query_member(cluster, cursor, member, role, command, connect_parameters=dict()):
def query_member(cluster, cursor, member, role, command, connect_parameters=None):
if connect_parameters is None:
connect_parameters = {}
try:
if cursor is None:
cursor = get_cursor(cluster, role=role, member=member, connect_parameters=connect_parameters)
+1 -1
View File
@@ -6,6 +6,6 @@ PyYAML
requests
six >= 1.7
kazoo>=2.2.1
python-etcd==0.4.1
python-etcd==0.4.2
click>=4.1
prettytable>=0.7
+1 -1
View File
@@ -6,6 +6,6 @@ PyYAML
requests
six
kazoo>=2.2.1
python-etcd==0.4.1
python-etcd==0.4.2
click>=4.1
prettytable>=0.7