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/inventory | |
| 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/inventory')
| -rw-r--r-- | lib/ansible/inventory/data.py | 7 | ||||
| -rw-r--r-- | lib/ansible/inventory/manager.py | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/lib/ansible/inventory/data.py b/lib/ansible/inventory/data.py index 9143c22410..e183845891 100644 --- a/lib/ansible/inventory/data.py +++ b/lib/ansible/inventory/data.py @@ -26,14 +26,11 @@ from ansible.errors import AnsibleError from ansible.inventory.group import Group from ansible.inventory.host import Host from ansible.module_utils.six import iteritems, string_types +from ansible.utils.display import Display from ansible.utils.vars import combine_vars from ansible.utils.path import basedir -try: - from __main__ import display -except ImportError: - from ansible.utils.display import Display - display = Display() +display = Display() class InventoryData(object): diff --git a/lib/ansible/inventory/manager.py b/lib/ansible/inventory/manager.py index 6e174a04f7..a920a5468a 100644 --- a/lib/ansible/inventory/manager.py +++ b/lib/ansible/inventory/manager.py @@ -32,12 +32,9 @@ from ansible.module_utils._text import to_bytes, to_text from ansible.parsing.utils.addresses import parse_address from ansible.plugins.loader import inventory_loader from ansible.utils.path import unfrackpath +from ansible.utils.display import Display -try: - from __main__ import display -except ImportError: - from ansible.utils.display import Display - display = Display() +display = Display() IGNORED_ALWAYS = [br"^\.", b"^host_vars$", b"^group_vars$", b"^vars_plugins$"] IGNORED_PATTERNS = [to_bytes(x) for x in C.INVENTORY_IGNORE_PATTERNS] |