From 95e655eb67579c1bab2c00dd5a28c8d1b673769a Mon Sep 17 00:00:00 2001 From: Marius Gedminas Date: Wed, 23 Sep 2015 10:00:27 +0300 Subject: [PATCH] Python 3: there's no basestring 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. --- lib/ansible/inventory/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/ansible/inventory/__init__.py b/lib/ansible/inventory/__init__.py index 47d552774f..3e33c4c839 100644 --- a/lib/ansible/inventory/__init__.py +++ b/lib/ansible/inventory/__init__.py @@ -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)