Stop using six import. (#175)

Author: felixfontein

changelogs/fragments/175-imports.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - "proxmox inventory plugin and proxmox module utils - avoid Python 2 compatibility imports (https://github.com/ansible-collections/community.proxmox/pull/175)."

plugins/inventory/proxmox.py

@@ -202,13 +202,12 @@
 
 import itertools
 import re
+from urllib.parse import urlencode
 
 from ansible.module_utils.common._collections_compat import MutableMapping
 
 from ansible.errors import AnsibleError
 from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable
-from ansible.module_utils.six import string_types
-from ansible.module_utils.six.moves.urllib.parse import urlencode
 from ansible.utils.display import Display
 
 from ansible_collections.community.proxmox.plugins.module_utils.version import LooseVersion
@@ -472,7 +471,7 @@ def _get_vm_config(self, properties, node, vmid, vmtype, name):
                         out_val[k] = v
                     value = out_val
 
-                if config not in plaintext_configs and isinstance(value, string_types) \
+                if config not in plaintext_configs and isinstance(value, (str, bytes)) \
                         and all("=" in v for v in value.split(",")):
                     # split off strings with commas to a dict
                     # skip over any keys that cannot be processed

plugins/plugin_utils/unsafe.py

@@ -7,7 +7,6 @@
 
 import re
 
-from ansible.module_utils.six import binary_type, text_type
 from ansible.module_utils.common._collections_compat import Mapping, Set
 from ansible.module_utils.common.collections import is_sequence
 from ansible.utils.unsafe_proxy import (
@@ -29,11 +28,11 @@ def make_unsafe(value):
         return set(make_unsafe(elt) for elt in value)
     elif is_sequence(value):
         return type(value)(make_unsafe(elt) for elt in value)
-    elif isinstance(value, binary_type):
+    elif isinstance(value, bytes):
         if _RE_TEMPLATE_CHARS_BYTES.search(value):
             value = _make_unsafe(value)
         return value
-    elif isinstance(value, text_type):
+    elif isinstance(value, str):
         if _RE_TEMPLATE_CHARS.search(value):
             value = _make_unsafe(value)
         return value