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

Fix circular import

Browse source
This commit is contained in:
Toshio Kuratomi 2016-01-13 14:04:56 -08:00
parent f72d380bcf
commit 58f387a6dd
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/utils/display.py
View file

@ -35,7 +35,6 @@ from multiprocessing import Lock
from ansible import constants as C from ansible import constants as C
from ansible.errors import AnsibleError from ansible.errors import AnsibleError
from ansible.utils.color import stringc from ansible.utils.color import stringc
from ansible.utils.encrypt import do_encrypt
from ansible.utils.unicode import to_bytes, to_unicode from ansible.utils.unicode import to_bytes, to_unicode
try: try:
@ -313,6 +312,8 @@ class Display:
result = default result = default
if encrypt: if encrypt:
# Circular import because encrypt needs a display class
from ansible.utils.encrypt import do_encrypt
result = do_encrypt(result, encrypt, salt_size, salt) result = do_encrypt(result, encrypt, salt_size, salt)
# handle utf-8 chars # handle utf-8 chars