diff options
| author |   Michael S. Pedersen <michael.soelvkaer@gmail.com> | 2019-12-03 11:38:32 +0000 |
|---|---|---|
| committer | Michael S. Pedersen <michael.soelvkaer@gmail.com> | 2019-12-09 22:07:08 +0000 |
| commit | 95f2491ed89ac99b0d8bd006b4a13cbeb1eb96ce (patch) | |
| tree | 8d2d8cd00f3284036e9bf78d9ec9bfdb3e95c80b /nfvbench/utils.py | |
| parent | 24314713446b6411cedce4329ab5ebfd6da678a2 (diff) | |
NFVBENCH-153 Add support for python34.0.0
JIRA: NFVBENCH-153
Done using 2to3-3.6 with additional changes to fix data parsing and
testing (tox)
Signed-off-by: Michael S. Pedersen <michael.soelvkaer@gmail.com>
Change-Id: I242902f800da543d780507828c9bd1fbf409da6d
Diffstat (limited to 'nfvbench/utils.py')
| -rw-r--r-- | nfvbench/utils.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nfvbench/utils.py b/nfvbench/utils.py index ecbb55a..3974fd7 100644 --- a/nfvbench/utils.py +++ b/nfvbench/utils.py @@ -23,7 +23,7 @@ import errno import fcntl from functools import wraps import json -from log import LOG +from .log import LOG class TimeoutError(Exception): @@ -74,7 +74,7 @@ def save_json_result(result, json_file, std_json_path, service_chain, service_ch def byteify(data, ignore_dicts=False): # if this is a unicode string, return its string representation - if isinstance(data, unicode): + if isinstance(data, str): return data.encode('utf-8') # if this is a list of values, return list of byteified values if isinstance(data, list): @@ -83,7 +83,7 @@ def byteify(data, ignore_dicts=False): # but only if we haven't already byteified it if isinstance(data, dict) and not ignore_dicts: return {byteify(key, ignore_dicts=ignore_dicts): byteify(value, ignore_dicts=ignore_dicts) - for key, value in data.iteritems()} + for key, value in list(data.items())} # if it's anything else, return it in its original form return data |