internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-04-27 00:46:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Python 3: there's no basestring

Browse Source 
Fixes one failing test.

The long series of module_utils/basic.py fixes were all because
module_utils/basic is imported in ansible/inventory/script.py.
This commit is contained in:
Marius Gedminas
2015-09-23 10:00:27 +03:00
parent 2c4982b58d
commit 95e655eb67
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ansible/inventory/__init__.py
View File

@@ -26,6 +26,8 @@ import re
import stat
import itertools
from six import string_types
from ansible import constants as C
from ansible.errors import AnsibleError
@@ -78,7 +80,7 @@ class Inventory(object):
def parse_inventory(self, host_list):
if isinstance(host_list, basestring):
if isinstance(host_list, string_types):
if "," in host_list:
host_list = host_list.split(",")
host_list = [ h for h in host_list if h and h.strip() ]
@@ -589,7 +591,7 @@ class Inventory(object):
def is_file(self):
""" did inventory come from a file? """
if not isinstance(self.host_list, basestring):
if not isinstance(self.host_list, string_types):
return False
return self._loader.path_exists(self.host_list)