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

Python 3: two more instances of 'basestring'

Browse source 
Fixes two failing tests on Python 3.4.
This commit is contained in:
Marius Gedminas 2015-09-14 08:27:39 +03:00
parent f0efe1ecb0
commit 9877a5c415
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/utils/listify.py
View file

@ -20,6 +20,9 @@ from __future__ import (absolute_import, division, print_function)
__metaclass__ = type __metaclass__ = type
from collections import Iterable from collections import Iterable
from six import string_types
from ansible.template import Templar from ansible.template import Templar
from ansible.template.safe_eval import safe_eval from ansible.template.safe_eval import safe_eval
@ -28,14 +31,14 @@ __all__ = ['listify_lookup_plugin_terms']
#FIXME: probably just move this into lookup plugin base class #FIXME: probably just move this into lookup plugin base class
def listify_lookup_plugin_terms(terms, templar, loader, fail_on_undefined=False, convert_bare=True): def listify_lookup_plugin_terms(terms, templar, loader, fail_on_undefined=False, convert_bare=True):
if isinstance(terms, basestring): if isinstance(terms, string_types):
stripped = terms.strip() stripped = terms.strip()
#FIXME: warn/deprecation on bare vars in with_ so we can eventually remove fail on undefined override #FIXME: warn/deprecation on bare vars in with_ so we can eventually remove fail on undefined override
terms = templar.template(terms, convert_bare=convert_bare, fail_on_undefined=fail_on_undefined) terms = templar.template(terms, convert_bare=convert_bare, fail_on_undefined=fail_on_undefined)
else: else:
terms = templar.template(terms, fail_on_undefined=fail_on_undefined) terms = templar.template(terms, fail_on_undefined=fail_on_undefined)
if isinstance(terms, basestring) or not isinstance(terms, Iterable): if isinstance(terms, string_types) or not isinstance(terms, Iterable):
terms = [ terms ] terms = [ terms ]
return terms return terms