summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToshio Kuratomi <a.badger@gmail.com>2016-09-29 07:16:47 -0700
committerToshio Kuratomi <a.badger@gmail.com>2016-09-29 07:16:47 -0700
commit8968bb74744af248c7fb2dac07adc71550cf07f1 (patch)
treec14820e1d707c9ab96da489cdf41bfafb7180004
parent98d70953c28ee41e459803b9765a9e409162a575 (diff)
downloadansible-modules-core-8968bb74744af248c7fb2dac07adc71550cf07f1.tar.gz
Revert "No six in stable-2.1"
This reverts commit 415c3399488ff07ae0e06e4b1d8c8a1b0bf44d22. Revert mount changes for 2.1.2. They are causing regressions so it's too late for 2.1.2.
-rw-r--r--system/mount.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/system/mount.py b/system/mount.py
index 938f683f..df235e46 100644
--- a/system/mount.py
+++ b/system/mount.py
@@ -25,6 +25,7 @@ from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.basic import get_platform
from ansible.module_utils.ismount import ismount
from ansible.module_utils.pycompat24 import get_exception
+from ansible.module_utils.six import iteritems
import os
import re
@@ -165,7 +166,7 @@ def set_mount(module, **kwargs):
to_write = []
exists = False
changed = False
- escaped_args = dict([(k, _escape_fstab(v)) for k, v in args.items()])
+ escaped_args = dict([(k, _escape_fstab(v)) for k, v in args.iteritems()])
for line in open(args['fstab'], 'r').readlines():
if not line.strip():
to_write.append(line)