mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-06-09 17:59:09 -07:00
Migrate basestring to a python3 compatible type (#17199)
This commit is contained in:
parent
a695e18615
commit
a22909c226
28 changed files with 137 additions and 101 deletions
|
@ -32,6 +32,7 @@ import itertools
|
|||
import shlex
|
||||
|
||||
from ansible.module_utils.basic import BOOLEANS_TRUE, BOOLEANS_FALSE
|
||||
from ansible.module_utils.six import string_types
|
||||
|
||||
def to_list(val):
|
||||
if isinstance(val, (list, tuple)):
|
||||
|
@ -75,7 +76,7 @@ class Cli(object):
|
|||
elif isinstance(command, dict):
|
||||
output = cmd.get('output') or output
|
||||
cmd = cmd['command']
|
||||
if isinstance(prompt, basestring):
|
||||
if isinstance(prompt, string_types):
|
||||
prompt = re.compile(re.escape(prompt))
|
||||
return Command(command, output, prompt=prompt, response=response)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue