From ca3c45044b08e2bb07ddd43705cbb643ff6e8536 Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Thu, 12 Apr 2018 16:28:07 +0000 Subject: [PATCH] Switch pep8 job to python 3 pep8 under python 3 is more strict than under python 2, so to make sure our projects meet the more strict standards we want to run the pep8 jobs using python 3 by default. Change-Id: Ice3cffa36e9167f2f1f30337372cf9187af5e02e --- oslo_concurrency/processutils.py | 4 ++-- tox.ini | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/oslo_concurrency/processutils.py b/oslo_concurrency/processutils.py index 3ccbced..53a2d70 100644 --- a/oslo_concurrency/processutils.py +++ b/oslo_concurrency/processutils.py @@ -575,9 +575,9 @@ def ssh_execute(ssh, cmd, process_input=None, # to decode it, or an Unicode string otherwise. Encode to the # default encoding (ASCII) because mask_password() decodes from # the same encoding. - if isinstance(stdout, unicode): + if isinstance(stdout, six.text_type): stdout = stdout.encode() - if isinstance(stderr, unicode): + if isinstance(stderr, six.text_type): stderr = stderr.encode() else: # fsencode() is the reverse operation of fsdecode() diff --git a/tox.ini b/tox.ini index d004f41..a3174e5 100644 --- a/tox.ini +++ b/tox.ini @@ -14,6 +14,7 @@ commands = env TEST_EVENTLET=1 lockutils-wrapper python setup.py testr --slowest --testr-args='{posargs}' [testenv:pep8] +basepython = python3 deps = -r{toxinidir}/test-requirements.txt commands =