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

Merge pull request #12461 from mgedmin/py3k

Browse source 
Python 3: there's no basestring
This commit is contained in:
James Cammarata 2015-09-22 03:11:43 -04:00
commit f563b22446
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/parsing/__init__.py
View file

@ -25,7 +25,7 @@ import os
import stat import stat
from yaml import load, YAMLError from yaml import load, YAMLError
from six import text_type from six import text_type, string_types
from ansible.errors import AnsibleParserError from ansible.errors import AnsibleParserError
from ansible.errors.yaml_strings import YAML_SYNTAX_ERROR from ansible.errors.yaml_strings import YAML_SYNTAX_ERROR
@ -154,7 +154,7 @@ class DataLoader():
Reads the file contents from the given file name, and will decrypt them Reads the file contents from the given file name, and will decrypt them
if they are found to be vault-encrypted. if they are found to be vault-encrypted.
''' '''
if not file_name or not isinstance(file_name, basestring): if not file_name or not isinstance(file_name, string_types):
raise AnsibleParserError("Invalid filename: '%s'" % str(file_name)) raise AnsibleParserError("Invalid filename: '%s'" % str(file_name))
if not self.path_exists(file_name) or not self.is_file(file_name): if not self.path_exists(file_name) or not self.is_file(file_name):