From 9773a1f2896a914d237cb9926e3b5cdc0f004d1a Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Tue, 20 Nov 2018 17:06:51 -0600 Subject: Add a Singleton metaclass, use it with Display (#48935) * Add a Singleton class, use it with Display * update six import * Move remaining failes to display singleton * Fix rebase issues * Singleton improvements * Add code-smell for 'from __main__ import display'. ci_complete * s/self/cls/g * Add docs for no-main-display * Address linting issues * Add changelog fragment. ci_complete * Implement reentrant lock for class instantiation in Singleton * Add Display singleton porting guide --- lib/ansible/utils/jsonrpc.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'lib/ansible/utils/jsonrpc.py') diff --git a/lib/ansible/utils/jsonrpc.py b/lib/ansible/utils/jsonrpc.py index 794f1f4aea..d285cef688 100644 --- a/lib/ansible/utils/jsonrpc.py +++ b/lib/ansible/utils/jsonrpc.py @@ -9,13 +9,9 @@ import traceback from ansible.module_utils._text import to_text from ansible.module_utils.six import binary_type +from ansible.utils.display import Display - -try: - from __main__ import display -except ImportError: - from ansible.utils.display import Display - display = Display() +display = Display() class JsonRpcServer(object): -- cgit v1.2.1