cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #12407 from mgedmin/py3k

Browse source 
Python 3: basestring in play_context.py
This commit is contained in:
James Cammarata 2015-09-17 10:40:57 -04:00
commit c881b1acae
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/playbook/play_context.py
View file

@ -25,7 +25,7 @@ import pipes
import random
import re
from six import iteritems
from six import iteritems, string_types
from ansible import constants as C
from ansible.errors import AnsibleError
@ -250,7 +250,7 @@ class PlayContext(Base):
if hasattr(options, 'tags'):
if isinstance(options.tags, list):
self.only_tags.update(options.tags)
elif isinstance(options.tags, basestring):
elif isinstance(options.tags, string_types):
self.only_tags.update(options.tags.split(','))
if len(self.only_tags) == 0:
@ -259,7 +259,7 @@ class PlayContext(Base):
if hasattr(options, 'skip_tags'):
if isinstance(options.skip_tags, list):
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(','))
def set_task_and_variable_override(self, task, variables):