use iteritems vs items(), probably doesn't matter that much

pull/70/head
Michael DeHaan 13 years ago
parent a735dd2b17
commit c909b66864

@ -365,7 +365,7 @@ class PlayBook(object):
dark = results.get("dark", {}) dark = results.get("dark", {})
contacted = results.get("contacted", {}) contacted = results.get("contacted", {})
for host, msg in dark.items(): for host, msg in dark.iteritems():
self.processed[host] = 1 self.processed[host] = 1
self.callbacks.on_unreachable(host, msg) self.callbacks.on_unreachable(host, msg)
if not host in self.dark: if not host in self.dark:
@ -373,7 +373,7 @@ class PlayBook(object):
else: else:
self.dark[host] = self.dark[host] + 1 self.dark[host] = self.dark[host] + 1
for host, results in contacted.items(): for host, results in contacted.iteritems():
self.processed[host] = 1 self.processed[host] = 1
if is_failed(results): if is_failed(results):
@ -401,7 +401,7 @@ class PlayBook(object):
subtasks = task.get('notify', []) subtasks = task.get('notify', [])
if len(subtasks) > 0: if len(subtasks) > 0:
for host, results in contacted.items(): for host, results in contacted.iteritems():
if results.get('changed', False): if results.get('changed', False):
for subtask in subtasks: for subtask in subtasks:
self._flag_handler(handlers, subtask, host) self._flag_handler(handlers, subtask, host)
@ -446,7 +446,7 @@ class PlayBook(object):
# written to the JSON file and will also bubble facts back up via # written to the JSON file and will also bubble facts back up via
# magic in Runner() # magic in Runner()
push_var_str='' push_var_str=''
for (k,v) in vars.items(): for (k,v) in vars.iteritems():
push_var_str += "%s=%s " % (k,v) push_var_str += "%s=%s " % (k,v)
# push any variables down to the system # push any variables down to the system
@ -476,7 +476,7 @@ class PlayBook(object):
# now for each result, load into the setup cache so we can # now for each result, load into the setup cache so we can
# let runner template out future commands # let runner template out future commands
setup_ok = setup_results.get('contacted', {}) setup_ok = setup_results.get('contacted', {})
for (host, result) in setup_ok.items(): for (host, result) in setup_ok.iteritems():
SETUP_CACHE[host] = result SETUP_CACHE[host] = result
# run all the top level tasks, these get run on every node # run all the top level tasks, these get run on every node

Loading…
Cancel
Save