Removed dict.iteritems() in modules. (#18859)

This is for py3 compatibility, addressed in #18506
This commit is contained in:
Andrea Tartaglia 2016-12-12 23:16:23 +00:00 committed by Toshio Kuratomi
commit ef391a11ec
99 changed files with 251 additions and 250 deletions

View file

@ -468,13 +468,13 @@ def main():
args = dict(master=master, stratum=stratum, logging=logging)
changed = False
proposed = dict((k, v) for k, v in args.iteritems() if v is not None)
proposed = dict((k, v) for k, v in args.items() if v is not None)
if master is False:
proposed['stratum'] = None
stratum = None
delta = dict(set(proposed.iteritems()).difference(existing.iteritems()))
delta = dict(set(proposed.items()).difference(existing.items()))
delta_stratum = delta.get('stratum')
if delta_stratum:
@ -488,8 +488,8 @@ def main():
commands.append(command)
elif state == 'absent':
if existing:
isection = dict(set(proposed.iteritems()).intersection(
existing.iteritems()))
isection = dict(set(proposed.items()).intersection(
existing.items()))
command = config_ntp_options(isection, flip=True)
if command:
commands.append(command)