Merge pull request #12502 from mgedmin/py3k

Python 3: make test_variable_manager_precedence pass
This commit is contained in:
James Cammarata
2015-09-25 03:05:02 -04:00
7 changed files with 126 additions and 11 deletions

View File

@@ -24,6 +24,7 @@ import os
from collections import defaultdict
from collections import MutableMapping
from six import iteritems
from jinja2.exceptions import UndefinedError
try:
@@ -312,7 +313,7 @@ class VariableManager:
if self._inventory is not None:
all_vars['groups'] = dict()
for (group_name, group) in self._inventory.groups.iteritems():
for (group_name, group) in iteritems(self._inventory.groups):
all_vars['groups'][group_name] = [h.name for h in group.get_hosts()]
if include_hostvars: