From 7f57e397b038df48aab1f8b18cb992e11dc22d92 Mon Sep 17 00:00:00 2001 From: ricolin Date: Wed, 12 Apr 2017 14:31:00 +0800 Subject: [PATCH] Fix undefined basestring in py35 In py3 basestring is no longer valid, and should use `str` instead. In order to cover py2 and py3, we change to use six.string_types. Partial-Bug: #1682015 Change-Id: I2ba279241c64bcab93ecd9eb08081ce580c5f2e9 --- heat-config-docker-compose/install.d/hook-docker-compose.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/heat-config-docker-compose/install.d/hook-docker-compose.py b/heat-config-docker-compose/install.d/hook-docker-compose.py index 41219ef..0ccd51a 100755 --- a/heat-config-docker-compose/install.d/hook-docker-compose.py +++ b/heat-config-docker-compose/install.d/hook-docker-compose.py @@ -17,6 +17,7 @@ import dpath import json import logging import os +import six import subprocess import sys import yaml @@ -87,7 +88,7 @@ def main(argv=sys.argv): for value in dpath.util.values(config, '*/env_file'): if isinstance(value, list): compose_env_files.extend(value) - elif isinstance(value, basestring): + elif isinstance(value, six.string_types): compose_env_files.extend([value]) input_env_files = {}