diff options
author | Matt Clay <matt@mystile.com> | 2018-10-05 01:22:25 -0700 |
---|---|---|
committer | Matt Clay <matt@mystile.com> | 2018-10-08 11:26:37 -0700 |
commit | a11f631ee414ba1048b04564cc901f1ff8b67479 (patch) | |
tree | b2ab4420cb8ed7fcf18aa5ddaa4feb884a0deced /contrib | |
parent | c4d1f0d416a44e4a24322e2d3829439fdc7d0fe4 (diff) | |
download | ansible-a11f631ee414ba1048b04564cc901f1ff8b67479.tar.gz |
Python 3.8 collections compatibility fixes.
Includes a new pylint blacklist plugin to prevent regressions.
Diffstat (limited to 'contrib')
-rwxr-xr-x | contrib/inventory/ssh_config.py | 2 | ||||
-rwxr-xr-x | contrib/inventory/vmware.py | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/contrib/inventory/ssh_config.py b/contrib/inventory/ssh_config.py index 03c4aa3d7f..c7db6c7a88 100755 --- a/contrib/inventory/ssh_config.py +++ b/contrib/inventory/ssh_config.py @@ -43,12 +43,12 @@ import argparse import os.path import sys -from collections import MutableSequence import json import paramiko +from ansible.module_utils.common._collections_compat import MutableSequence SSH_CONF = '~/.ssh/config' diff --git a/contrib/inventory/vmware.py b/contrib/inventory/vmware.py index b52dd559a4..de52e713d6 100755 --- a/contrib/inventory/vmware.py +++ b/contrib/inventory/vmware.py @@ -30,7 +30,6 @@ required if these options are specified using environment variables. from __future__ import print_function -import collections import json import logging import optparse @@ -42,6 +41,8 @@ import time from six import integer_types, text_type, string_types from six.moves import configparser +from ansible.module_utils.common._collections_compat import MutableMapping + # Disable logging message trigged by pSphere/suds. try: from logging import NullHandler @@ -159,7 +160,7 @@ class VMwareInventory(object): if k.startswith('_'): continue new_key = parent_key + sep + k if parent_key else k - if isinstance(v, collections.MutableMapping): + if isinstance(v, MutableMapping): items.extend(self._flatten_dict(v, new_key, sep).items()) elif isinstance(v, (list, tuple)): if all([isinstance(x, string_types) for x in v]): @@ -229,7 +230,7 @@ class VMwareInventory(object): except AttributeError: host_info['%ss' % attr] = [] for k, v in self._get_obj_info(host.summary, depth=0).items(): - if isinstance(v, collections.MutableMapping): + if isinstance(v, MutableMapping): for k2, v2 in v.items(): host_info[k2] = v2 elif k != 'host': @@ -265,7 +266,7 @@ class VMwareInventory(object): except AttributeError: vm_info['guestState'] = '' for k, v in self._get_obj_info(vm.summary, depth=0).items(): - if isinstance(v, collections.MutableMapping): + if isinstance(v, MutableMapping): for k2, v2 in v.items(): if k2 == 'host': k2 = 'hostSystem' |