Skip to content

Fix Python 3 compatibility #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix Python 3 compatibility #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b869f7
Fix Python 3 compatibility
jqueuniet Apr 2, 2019
2994c72
Fix another dict merge for Python 3
jqueuniet May 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions lib/ansible/plugins/lookup/jerakia.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ def get_config(self, configfile=os.environ.get('ANSIBLE_JERAKIA_CONFIG', 'jeraki
if os.path.isfile(configfile):
data = open(configfile, "r")
defined_config = yaml.load(data)
combined_config = dict(defaults.items() + defined_config.items())
combined_config = defaults.copy()
combined_config.update(defined_config)
return combined_config
else:
raise AnsibleError("Unable to find configuration file %s" % configfile)
Expand Down Expand Up @@ -77,7 +78,7 @@ def scope(self, variables):
scope_conf = self.config['scope']
if not self.config['scope']:
return {}
for key, val in scope_conf.iteritems():
for key, val in scope_conf.items():
metadata_entry = "metadata_%(key)s" % locals()
scope_value = self.dot_to_dictval(variables, val)
scope_data[metadata_entry] = scope_value
Expand All @@ -101,7 +102,8 @@ def lookup(self, key, namespace, policy='default', variables=None):
'policy': policy,
}

params = dict(scope.items() + options.items())
params = scope.copy()
params.update(options)
headers = self.headers()

response = requests.get(endpoint_url, params=params, headers=headers)
Expand Down