summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Newswanger <dnewswan@redhat.com>2018-03-02 12:03:12 -0500
committerToshio Kuratomi <a.badger@gmail.com>2018-03-05 09:07:27 -0800
commit5911ee813a791afe269fb5366f079a8740761226 (patch)
treec56b93ba7102a1fec38ddeb328da293178858861
parent5328bfd99bbdff552a2e8ef26664130d428ce1d8 (diff)
downloadansible-5911ee813a791afe269fb5366f079a8740761226.tar.gz
fix python 3 dictionary issue
-rw-r--r--CHANGELOG.md2
-rw-r--r--lib/ansible/plugins/action/eos_config.py2
-rw-r--r--lib/ansible/plugins/action/ios_config.py2
3 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63597da808..cd301b330b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ Ansible Changes By Release
## 2.4.4 "Dancing Days" - TBD
### Bugfixes
+* Fix python 3 dictionary runtime error in ios_confg and eos_config
+ (https://github.com/ansible/ansible/issues/36717)
* Fix `win_script` to work with large arguments and removed uneeded function
that produces errors and was not needed
(https://github.com/ansible/ansible/pull/33855)
diff --git a/lib/ansible/plugins/action/eos_config.py b/lib/ansible/plugins/action/eos_config.py
index 9513fe2d3c..64a1a70678 100644
--- a/lib/ansible/plugins/action/eos_config.py
+++ b/lib/ansible/plugins/action/eos_config.py
@@ -55,7 +55,7 @@ class ActionModule(_ActionModule):
# strip out any keys that have two leading and two trailing
# underscore characters
- for key in result.keys():
+ for key in list(result.keys()):
if PRIVATE_KEYS_RE.match(key):
del result[key]
diff --git a/lib/ansible/plugins/action/ios_config.py b/lib/ansible/plugins/action/ios_config.py
index fe457bc8c9..c72d6de55c 100644
--- a/lib/ansible/plugins/action/ios_config.py
+++ b/lib/ansible/plugins/action/ios_config.py
@@ -54,7 +54,7 @@ class ActionModule(_ActionModule):
# strip out any keys that have two leading and two trailing
# underscore characters
- for key in result.keys():
+ for key in list(result.keys()):
if PRIVATE_KEYS_RE.match(key):
del result[key]