diff options
| author | Matt Martz <matt@sivel.net> | 2018-11-20 17:06:51 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-20 17:06:51 -0600 |
| commit | 9773a1f2896a914d237cb9926e3b5cdc0f004d1a (patch) | |
| tree | 50d16f7f19b8fcc81f11ce220b9af22ab19c9709 /lib/ansible/vars | |
| parent | 54a2f21f93c54c4a10e378e500efcc52999d6408 (diff) | |
| download | ansible-9773a1f2896a914d237cb9926e3b5cdc0f004d1a.tar.gz | |
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
Diffstat (limited to 'lib/ansible/vars')
| -rw-r--r-- | lib/ansible/vars/clean.py | 7 | ||||
| -rw-r--r-- | lib/ansible/vars/manager.py | 7 | ||||
| -rw-r--r-- | lib/ansible/vars/reserved.py | 7 |
3 files changed, 6 insertions, 15 deletions
diff --git a/lib/ansible/vars/clean.py b/lib/ansible/vars/clean.py index 7b29383c2e..f98d3b77d5 100644 --- a/lib/ansible/vars/clean.py +++ b/lib/ansible/vars/clean.py @@ -12,12 +12,9 @@ from ansible import constants as C from ansible.module_utils._text import to_text from ansible.module_utils import six from ansible.plugins.loader import connection_loader +from ansible.utils.display import Display -try: - from __main__ import display -except ImportError: - from ansible.utils.display import Display - display = Display() +display = Display() def module_response_deepcopy(v): diff --git a/lib/ansible/vars/manager.py b/lib/ansible/vars/manager.py index 84658e2827..439f2d8beb 100644 --- a/lib/ansible/vars/manager.py +++ b/lib/ansible/vars/manager.py @@ -41,16 +41,13 @@ from ansible.module_utils.six import iteritems, text_type, string_types from ansible.plugins.loader import lookup_loader, vars_loader from ansible.plugins.cache import FactCache from ansible.template import Templar +from ansible.utils.display import Display from ansible.utils.listify import listify_lookup_plugin_terms from ansible.utils.vars import combine_vars from ansible.utils.unsafe_proxy import wrap_var from ansible.vars.clean import namespace_facts, clean_facts -try: - from __main__ import display -except ImportError: - from ansible.utils.display import Display - display = Display() +display = Display() def preprocess_vars(a): diff --git a/lib/ansible/vars/reserved.py b/lib/ansible/vars/reserved.py index 16d44ef684..d7daea0705 100644 --- a/lib/ansible/vars/reserved.py +++ b/lib/ansible/vars/reserved.py @@ -23,12 +23,9 @@ from ansible.playbook import Play from ansible.playbook.block import Block from ansible.playbook.role import Role from ansible.playbook.task import Task +from ansible.utils.display import Display -try: - from __main__ import display -except ImportError: - from ansible.utils.display import Display - display = Display() +display = Display() def get_reserved_names(include_private=True): |