ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-06-11 18:59:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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/module_utils/netcli.py
View file

@ -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)