cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove internal use of display and use the top-level import

Browse source
This commit is contained in:
James Cammarata 2015-11-10 12:02:29 -05:00
parent 0fc187893d
commit 566144461f
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/vars/__init__.py
View file

@ -100,13 +100,6 @@ class VariableManager:
self._inventory = None
self._omit_token = '__omit_place_holder__%s' % sha1(os.urandom(64)).hexdigest()
try:
from __main__ import display
self._display = display
except ImportError:
from ansible.utils.display import Display
self._display = Display()
def __getstate__(self):
data = dict(
fact_cache = self._fact_cache.copy(),
@ -308,7 +301,7 @@ class VariableManager:
else:
# we do not have a full context here, and the missing variable could be
# because of that, so just show a warning and continue
self._display.vvv("skipping vars_file '%s' due to an undefined variable" % vars_file_item)
display.vvv("skipping vars_file '%s' due to an undefined variable" % vars_file_item)
continue
if not C.DEFAULT_PRIVATE_ROLE_VARS:
@ -418,7 +411,7 @@ class VariableManager:
except AnsibleUndefinedVariable as e:
if 'has no attribute' in str(e):
loop_terms = []
self._display.deprecated("Skipping task due to undefined attribute, in the future this will be a fatal error.")
display.deprecated("Skipping task due to undefined attribute, in the future this will be a fatal error.")
else:
raise
items = lookup_loader.get(task.loop, loader=loader, templar=templar).run(terms=loop_terms, variables=vars_copy)