mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-08 06:12:51 +00:00
Python 3.8 collections compatibility fixes.
Includes a new pylint blacklist plugin to prevent regressions.
This commit is contained in:
@@ -266,7 +266,6 @@ import os
|
||||
import re
|
||||
import traceback
|
||||
|
||||
from collections import MutableMapping
|
||||
from distutils.version import LooseVersion
|
||||
from io import BytesIO
|
||||
|
||||
@@ -279,6 +278,7 @@ except ImportError:
|
||||
from ansible.module_utils.basic import AnsibleModule, json_dict_bytes_to_unicode
|
||||
from ansible.module_utils.six import iteritems, string_types
|
||||
from ansible.module_utils._text import to_bytes, to_native
|
||||
from ansible.module_utils.common._collections_compat import MutableMapping
|
||||
|
||||
_IDENT = r"[a-zA-Z-][a-zA-Z0-9_\-\.]*"
|
||||
_NSIDENT = _IDENT + "|" + _IDENT + ":" + _IDENT
|
||||
|
||||
@@ -270,11 +270,11 @@ import sys
|
||||
import tempfile
|
||||
import traceback
|
||||
|
||||
from collections import Mapping, Sequence
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
from ansible.module_utils.six import PY2, iteritems, string_types
|
||||
from ansible.module_utils.six.moves.urllib.parse import urlencode, urlsplit
|
||||
from ansible.module_utils._text import to_native, to_text
|
||||
from ansible.module_utils.common._collections_compat import Mapping, Sequence
|
||||
from ansible.module_utils.urls import fetch_url, url_argument_spec
|
||||
|
||||
JSON_CANDIDATES = ('text', 'json', 'javascript')
|
||||
|
||||
Reference in New Issue
Block a user