mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-23 13:20:23 -07:00
Python 3: basestring in play_context.py
This commit is contained in:
parent
3db8070aa3
commit
8243954dcd
1 changed files with 3 additions and 3 deletions
|
@ -25,7 +25,7 @@ import pipes
|
||||||
import random
|
import random
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from six import iteritems
|
from six import iteritems, string_types
|
||||||
|
|
||||||
from ansible import constants as C
|
from ansible import constants as C
|
||||||
from ansible.errors import AnsibleError
|
from ansible.errors import AnsibleError
|
||||||
|
@ -250,7 +250,7 @@ class PlayContext(Base):
|
||||||
if hasattr(options, 'tags'):
|
if hasattr(options, 'tags'):
|
||||||
if isinstance(options.tags, list):
|
if isinstance(options.tags, list):
|
||||||
self.only_tags.update(options.tags)
|
self.only_tags.update(options.tags)
|
||||||
elif isinstance(options.tags, basestring):
|
elif isinstance(options.tags, string_types):
|
||||||
self.only_tags.update(options.tags.split(','))
|
self.only_tags.update(options.tags.split(','))
|
||||||
|
|
||||||
if len(self.only_tags) == 0:
|
if len(self.only_tags) == 0:
|
||||||
|
@ -259,7 +259,7 @@ class PlayContext(Base):
|
||||||
if hasattr(options, 'skip_tags'):
|
if hasattr(options, 'skip_tags'):
|
||||||
if isinstance(options.skip_tags, list):
|
if isinstance(options.skip_tags, list):
|
||||||
self.skip_tags.update(options.skip_tags)
|
self.skip_tags.update(options.skip_tags)
|
||||||
elif isinstance(options.skip_tags, basestring):
|
elif isinstance(options.skip_tags, string_types):
|
||||||
self.skip_tags.update(options.skip_tags.split(','))
|
self.skip_tags.update(options.skip_tags.split(','))
|
||||||
|
|
||||||
def set_task_and_variable_override(self, task, variables):
|
def set_task_and_variable_override(self, task, variables):
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue