ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-25 03:41:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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

6
lib/ansible/cli/doc.py
View file

@ -24,7 +24,7 @@ import os
import traceback
import textwrap
from ansible.compat.six import iteritems
from ansible.compat.six import iteritems, string_types
from ansible import constants as C
from ansible.errors import AnsibleError, AnsibleOptionsError
@ -309,13 +309,13 @@ class DocCLI(CLI):
maintainers = set()
if 'author' in doc:
if isinstance(doc['author'], basestring):
if isinstance(doc['author'], string_types):
maintainers.add(doc['author'])
else:
maintainers.update(doc['author'])
if 'maintainers' in doc:
if isinstance(doc['maintainers'], basestring):
if isinstance(doc['maintainers'], string_types):
maintainers.add(doc['author'])
else:
maintainers.update(doc['author'])