---
check | 2 +-
setup.py | 2 +-
yarns/900-implements.yarn | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/check b/check
index 2d3d52c..290797e 100755
--- a/check
+++ b/check
@@ -4,7 +4,7 @@ set -eu
python3 -m CoverageTestRunner --ignore-missing-from=without-tests yarns vmdb
yarn \
- --shell=python2 \
+ --shell=python3 \
--shell-arg '' \
--shell-library yarns/lib.py \
--env "PYTHONPATH=$(pwd)/yarns" \
diff --git a/setup.py b/setup.py
index 3b89429..bd56d2b 100755
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ class Build(build):
def generate_troff(self, program, lang):
with open('%s.1%s' % (program, lang), 'w') as f:
cliapp.runcmd(
- ['python', program,
+ ['python3', program,
'--generate-manpage=%s.1%s.in' % (program, lang),
'--output=%s.1' % program],
stdout=f)
diff --git a/yarns/900-implements.yarn b/yarns/900-implements.yarn
index f8bc328..c0b7af1 100644
--- a/yarns/900-implements.yarn
+++ b/yarns/900-implements.yarn
@@ -13,15 +13,15 @@ This chapter contains the implementations for all scenario
steps.
vmdb2 = os.path.join(srcdir, 'vmdb2')
exit, out, err = cliapp.runcmd_unchecked([vmdb2] + args.split())
vars['exit'] = exit
- vars['stdout'] = out
- vars['stderr'] = err
+ vars['stdout'] = out.decode()
+ vars['stderr'] = err.decode()
IMPLEMENTS THEN exit code is (\d+)
wanted = int(get_next_match())
exit = vars['exit']
- print 'exit code', exit
- print 'stdout:', vars['stdout']
- print 'stderr:', vars['stderr']
+ print('exit code', exit)
+ print('stdout:', vars['stdout'])
+ print('stderr:', vars['stderr'])
assertEqual(exit, wanted)
IMPLEMENTS THEN stdout contains "(.+)" followed by "(.+)"
--
2.24.0
