From 58f387a6dd7f53770c50c788ff083184bd9ea682 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Wed, 13 Jan 2016 14:04:56 -0800 Subject: [PATCH] Fix circular import --- lib/ansible/utils/display.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/ansible/utils/display.py b/lib/ansible/utils/display.py index 385bc51e06..57cee14ffe 100644 --- a/lib/ansible/utils/display.py +++ b/lib/ansible/utils/display.py @@ -35,7 +35,6 @@ from multiprocessing import Lock from ansible import constants as C from ansible.errors import AnsibleError from ansible.utils.color import stringc -from ansible.utils.encrypt import do_encrypt from ansible.utils.unicode import to_bytes, to_unicode try: @@ -313,6 +312,8 @@ class Display: result = default 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) # handle utf-8 chars