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

Migrate basestring to a python3 compatible type (#17199)

Browse Source
This commit is contained in:
Toshio Kuratomi
2016-08-23 13:13:44 -07:00
committed by GitHub
parent a695e18615
commit a22909c226
28 changed files with 137 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ansible/plugins/action/ops_template.py
View File

@@ -21,6 +21,7 @@ __metaclass__ = type
import json
from ansible.compat.six import string_types
from ansible.plugins.action import ActionBase
from ansible.plugins.action.net_template import ActionModule as NetActionModule
@@ -32,7 +33,7 @@ class ActionModule(NetActionModule, ActionBase):
result = dict(changed=False)
if isinstance(self._task.args['src'], basestring):
if isinstance(self._task.args['src'], string_types):
self._handle_template()
result.update(self._execute_module(module_name=self._task.action,

5
lib/ansible/plugins/action/set_fact.py
View File

@@ -18,13 +18,12 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
from ansible.compat.six import iteritems
from ansible.compat.six import iteritems, string_types
from ansible.plugins.action import ActionBase
from ansible.utils.boolean import boolean
from ansible.utils.vars import isidentifier
class ActionModule(ActionBase):
TRANSFERS_FILES = False
@@ -45,7 +44,7 @@ class ActionModule(ActionBase):
result['msg'] = "The variable name '%s' is not valid. Variables must start with a letter or underscore character, and contain only letters, numbers and underscores." % k
return result
if isinstance(v, basestring) and v.lower() in ('true', 'false', 'yes', 'no'):
if isinstance(v, string_types) and v.lower() in ('true', 'false', 'yes', 'no'):
v = boolean(v)
facts[k] = v

5
lib/ansible/plugins/callback/mail.py
View File

@@ -24,6 +24,7 @@ import os
import smtplib
import json
from ansible.compat.six import string_types
from ansible.utils.unicode import to_bytes
from ansible.plugins.callback import CallbackBase
@@ -108,7 +109,7 @@ class CallbackModule(CallbackBase):
res = result._result
sender = '"Ansible: %s" <root>' % host
if isinstance(res, basestring):
if isinstance(res, string_types):
subject = 'Unreachable: %s' % res.strip('\r\n').split('\n')[-1]
body = 'An error occurred for host ' + host + ' with the following message:\n\n' + res
else:
@@ -123,7 +124,7 @@ class CallbackModule(CallbackBase):
res = result._result
sender = '"Ansible: %s" <root>' % host
if isinstance(res, basestring):
if isinstance(res, string_types):
subject = 'Async failure: %s' % res.strip('\r\n').split('\n')[-1]
body = 'An error occurred for host ' + host + ' with the following message:\n\n' + res
else:

3
lib/ansible/plugins/connection/__init__.py
View File

@@ -30,6 +30,7 @@ from functools import wraps
from ansible.compat.six import with_metaclass
from ansible import constants as C
from ansible.compat.six import string_types
from ansible.errors import AnsibleError
from ansible.plugins import shell_loader
from ansible.utils.unicode import to_bytes, to_unicode
@@ -248,7 +249,7 @@ class ConnectionBase(with_metaclass(ABCMeta, object)):
def check_password_prompt(self, output):
if self._play_context.prompt is None:
return False
elif isinstance(self._play_context.prompt, basestring):
elif isinstance(self._play_context.prompt, string_types):
return output.startswith(self._play_context.prompt)
else:
return self._play_context.prompt(output)

4
lib/ansible/plugins/connection/winrm.py
View File

@@ -26,7 +26,7 @@ import shlex
import traceback
import json
from ansible.compat.six import string_types
from ansible.compat.six.moves.urllib.parse import urlunsplit
from ansible.errors import AnsibleError, AnsibleConnectionFailure
@@ -106,7 +106,7 @@ class Connection(ConnectionBase):
else:
self._winrm_transport = transport_selector
self._winrm_transport = hostvars.get('ansible_winrm_transport', self._winrm_transport)
if isinstance(self._winrm_transport, basestring):
if isinstance(self._winrm_transport, string_types):
self._winrm_transport = [x.strip() for x in self._winrm_transport.split(',') if x.strip()]
unsupported_transports = set(self._winrm_transport).difference(self._winrm_supported_authtypes)

3
lib/ansible/plugins/filter/core.py
View File

@@ -126,8 +126,7 @@ def fileglob(pathname):
def regex_replace(value='', pattern='', replacement='', ignorecase=False):
''' Perform a `re.sub` returning a string '''
if not isinstance(value, basestring):
value = str(value)
value = to_unicode(value, errors='strict', nonstring='simplerepr')
if ignorecase:
flags = re.I

5
lib/ansible/plugins/lookup/first_found.py
View File

@@ -122,6 +122,7 @@ import os
from jinja2.exceptions import UndefinedError
from ansible.compat.six import string_types
from ansible.errors import AnsibleFileNotFound, AnsibleLookupError, AnsibleUndefinedVariable
from ansible.plugins.lookup import LookupBase
from ansible.utils.boolean import boolean
@@ -146,14 +147,14 @@ class LookupModule(LookupBase):
skip = boolean(term.get('skip', False))
filelist = files
if isinstance(files, basestring):
if isinstance(files, string_types):
files = files.replace(',', ' ')
files = files.replace(';', ' ')
filelist = files.split(' ')
pathlist = paths
if paths:
if isinstance(paths, basestring):
if isinstance(paths, string_types):
paths = paths.replace(',', ' ')
paths = paths.replace(':', ' ')
paths = paths.replace(';', ' ')

3
lib/ansible/plugins/lookup/flattened.py
View File

@@ -17,6 +17,7 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
from ansible.compat.six import string_types
from ansible.errors import AnsibleError
from ansible.plugins.lookup import LookupBase
from ansible.utils.listify import listify_lookup_plugin_terms
@@ -44,7 +45,7 @@ class LookupModule(LookupBase):
# ignore undefined items
break
if isinstance(term, basestring):
if isinstance(term, string_types):
# convert a variable to a list
term2 = listify_lookup_plugin_terms(term, templar=self._templar, loader=self._loader)
# but avoid converting a plain string to a list of one string

5
lib/ansible/plugins/lookup/subelements.py
View File

@@ -17,6 +17,7 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
from ansible.compat.six import string_types
from ansible.errors import AnsibleError
from ansible.plugins.lookup import LookupBase
from ansible.utils.listify import listify_lookup_plugin_terms
@@ -41,7 +42,7 @@ class LookupModule(LookupBase):
_raise_terms_error()
# first term should be a list (or dict), second a string holding the subkey
if not isinstance(terms[0], (list, dict)) or not isinstance(terms[1], basestring):
if not isinstance(terms[0], (list, dict)) or not isinstance(terms[1], string_types):
_raise_terms_error("first a dict or a list, second a string pointing to the subkey")
subelements = terms[1].split(".")
@@ -59,7 +60,7 @@ class LookupModule(LookupBase):
flags = {}
if len(terms) == 3:
flags = terms[2]
if not isinstance(flags, dict) and not all([isinstance(key, basestring) and key in FLAGS for key in flags]):
if not isinstance(flags, dict) and not all([isinstance(key, string_types) and key in FLAGS for key in flags]):
_raise_terms_error("the optional third item must be a dict with flags %s" % FLAGS)
# build_items