From 8243954dcdab4a3549e1456e0ff4c1dab213a1f7 Mon Sep 17 00:00:00 2001 From: Marius Gedminas Date: Thu, 17 Sep 2015 08:08:55 +0300 Subject: [PATCH] Python 3: basestring in play_context.py --- lib/ansible/playbook/play_context.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ansible/playbook/play_context.py b/lib/ansible/playbook/play_context.py index 5b1f6c9ade7..6edb5a10833 100644 --- a/lib/ansible/playbook/play_context.py +++ b/lib/ansible/playbook/play_context.py @@ -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):