Python 3: basestring in play_context.py

This commit is contained in:
Marius Gedminas 2015-09-17 08:08:55 +03:00
commit 8243954dcd

View file

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