Fix circular import

pull/14019/head
Toshio Kuratomi 9 years ago
parent 79931041e2
commit be087575cc

@ -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:
@ -308,6 +307,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

Loading…
Cancel
Save