openstack
/
heat-agents
Code Issues Proposed changes

Merge "Fix undefined basestring in py35"

This commit is contained in:
Jenkins 2017-06-28 20:56:53 +00:00 committed by Gerrit Code Review
parent 964c41e3ab 7f57e397b0
commit cb2690a5fc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
heat-config-docker-compose/install.d/hook-docker-compose.py
View File

@ -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 = {}