internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 05:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a Singleton metaclass, use it with Display (#48935)

Browse Source 
* 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
This commit is contained in:
Matt Martz
2018-11-20 17:06:51 -06:00
committed by GitHub
parent 54a2f21f93
commit 9773a1f289
149 changed files with 407 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ansible/plugins/httpapi/eos.py
View File

@@ -11,12 +11,9 @@ from ansible.module_utils._text import to_text
from ansible.module_utils.connection import ConnectionError
from ansible.module_utils.network.common.utils import to_list
from ansible.plugins.httpapi import HttpApiBase
from ansible.utils.display import Display
try:
from __main__ import display
except ImportError:
from ansible.utils.display import Display
display = Display()
display = Display()
class HttpApi(HttpApiBase):

8
lib/ansible/plugins/httpapi/ftd.py
View File

@@ -60,6 +60,7 @@ from ansible.plugins.httpapi import HttpApiBase
from urllib3 import encode_multipart_formdata
from urllib3.fields import RequestField
from ansible.module_utils.connection import ConnectionError
from ansible.utils.display import Display
BASE_HEADERS = {
'Content-Type': 'application/json',
@@ -69,12 +70,7 @@ BASE_HEADERS = {
TOKEN_EXPIRATION_STATUS_CODE = 408
UNAUTHORIZED_STATUS_CODE = 401
try:
from __main__ import display
except ImportError:
from ansible.utils.display import Display
display = Display()
display = Display()
class HttpApi(HttpApiBase):

7
lib/ansible/plugins/httpapi/nxos.py
View File

@@ -10,12 +10,9 @@ from ansible.module_utils._text import to_text
from ansible.module_utils.connection import ConnectionError
from ansible.module_utils.network.common.utils import to_list
from ansible.plugins.httpapi import HttpApiBase
from ansible.utils.display import Display
try:
from __main__ import display
except ImportError:
from ansible.utils.display import Display
display = Display()
display = Display()
class HttpApi(HttpApiBase):