From 9b0c6c46f6ff63febcbea9476e043c64b603ee02 Mon Sep 17 00:00:00 2001 From: "huang.zhiping" Date: Sat, 9 Jun 2018 20:49:05 +0800 Subject: fix tox python3 overrides We want to default to running all tox environments under python 3, so set the basepython value in each environment. We do not want to specify a minor version number, because we do not want to have to update the file every time we upgrade python. We do not want to set the override once in testenv, because that breaks the more specific versions used in default environments like py35 and py36. Change-Id: I04b87b308a82113a57ea41bde0329e92b07b642e --- cinderclient/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cinderclient') diff --git a/cinderclient/utils.py b/cinderclient/utils.py index 0d8408e..f9af58d 100644 --- a/cinderclient/utils.py +++ b/cinderclient/utils.py @@ -187,7 +187,7 @@ def print_list(objs, fields, exclude_unavailable=False, formatters=None, def _encode(src): """remove extra 'u' in PY2.""" - if six.PY2 and isinstance(src, unicode): + if six.PY2 and isinstance(src, six.text_type): return src.encode('utf-8') return src -- cgit v1.2.1