cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix uri to run on python3 (#4580)

Browse source 
Since dict no longer have a method iteritems, we have to use
the six wrapper.
This commit is contained in:
Michael Scherer 2016-08-31 17:16:01 +02:00 committed by Matt Clay
parent f59af7d29e
commit b48e65219b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/network/basics/uri.py
View file

@ -390,7 +390,7 @@ def main():
# Grab all the http headers. Need this hack since passing multi-values is # Grab all the http headers. Need this hack since passing multi-values is
# currently a bit ugly. (e.g. headers='{"Content-Type":"application/json"}') # currently a bit ugly. (e.g. headers='{"Content-Type":"application/json"}')
for key, value in module.params.iteritems(): for key, value in six.iteritems(module.params):
if key.startswith("HEADER_"): if key.startswith("HEADER_"):
skey = key.replace("HEADER_", "") skey = key.replace("HEADER_", "")
dict_headers[skey] = value dict_headers[skey] = value
@ -434,7 +434,7 @@ def main():
# Transmogrify the headers, replacing '-' with '_', since variables dont # Transmogrify the headers, replacing '-' with '_', since variables dont
# work with dashes. # work with dashes.
uresp = {} uresp = {}
for key, value in resp.iteritems(): for key, value in six.iteritems(resp):
ukey = key.replace("-", "_") ukey = key.replace("-", "_")
uresp[ukey] = value uresp[ukey] = value