diff options
author | James Cammarata <jimi@sngx.net> | 2015-09-17 10:40:57 -0400 |
---|---|---|
committer | James Cammarata <jimi@sngx.net> | 2015-09-17 10:40:57 -0400 |
commit | c881b1acae57ab622b52db125324e19fb5720cc7 (patch) | |
tree | 29501a5e0cdc3345ed7d841adfe4911d8a38ed3e | |
parent | 8acbc00853f48982d61539752ee2b4b378671ac6 (diff) | |
parent | 8243954dcdab4a3549e1456e0ff4c1dab213a1f7 (diff) | |
download | ansible-c881b1acae57ab622b52db125324e19fb5720cc7.tar.gz |
Merge pull request #12407 from mgedmin/py3k
Python 3: basestring in play_context.py
-rw-r--r-- | lib/ansible/playbook/play_context.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ansible/playbook/play_context.py b/lib/ansible/playbook/play_context.py index 5b1f6c9ade..6edb5a1083 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): |