summaryrefslogtreecommitdiff
path: root/benchmark/benchmark.py
diff options
context:
space:
mode:
authorwangzihao <wangzihao@yovole.com>2020-09-30 14:44:52 +0800
committerwangzihao <wangzihao@yovole.com>2020-09-30 16:34:20 +0800
commit81352d08e90ff9949322374a4930d29ec102124c (patch)
treebb4821b4ff3ffccd63753142831e9de65473c692 /benchmark/benchmark.py
parentb98693c7086a4e1cfc9dd2000d098a82c2111efd (diff)
downloadoslo-rootwrap-81352d08e90ff9949322374a4930d29ec102124c.tar.gz
Remove six.PY3
The Python 2.7 Support has been dropped since Ussuri. So remove hacking rules for compatibility between python 2 and 3. Change-Id: Idd6a1efd1857a70fc7d960b365bfc58d6cbe00d3
Diffstat (limited to 'benchmark/benchmark.py')
-rw-r--r--benchmark/benchmark.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/benchmark/benchmark.py b/benchmark/benchmark.py
index 83ec00a..7340166 100644
--- a/benchmark/benchmark.py
+++ b/benchmark/benchmark.py
@@ -16,7 +16,6 @@
import atexit
import math
import os
-import six
import subprocess
import sys
import timeit
@@ -33,9 +32,8 @@ def run_plain(cmd):
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
out, err = obj.communicate()
- if six.PY3:
- out = os.fsdecode(out)
- err = os.fsdecode(err)
+ out = os.fsdecode(out)
+ err = os.fsdecode(err)
return obj.returncode, out, err