diff options
| author |   Mark Beierl <mbeierl@vmware.com> | 2019-12-16 16:37:36 -0500 |
|---|---|---|
| committer | Mark Beierl <mbeierl@vmware.com> | 2019-12-17 11:35:36 -0500 |
| commit | 8d97778672f843cd79ac9862b5fe8c13ef31091f (patch) | |
| tree | ade1e84445a7341ca72c48e05f343045a0e1b26d /docker/storperf-master/storperf/carbon/converter.py | |
| parent | ddc5a2888edf717ff074c272b01a6310e0d612fa (diff) | |
Update to Python3
Updates to make StorPerf Python3 compatible, including pulling
in SNAPS-OO as python3.
Change-Id: Ie4e7af684bd5a1b8db086893848b1889da6308ba
JIRA: STORPERF-268
Signed-off-by: Mark Beierl <mbeierl@vmware.com>
Diffstat (limited to 'docker/storperf-master/storperf/carbon/converter.py')
| -rw-r--r-- | docker/storperf-master/storperf/carbon/converter.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docker/storperf-master/storperf/carbon/converter.py b/docker/storperf-master/storperf/carbon/converter.py index 623c144..4b5e6aa 100644 --- a/docker/storperf-master/storperf/carbon/converter.py +++ b/docker/storperf-master/storperf/carbon/converter.py @@ -32,12 +32,12 @@ class Converter(object): def resurse_to_flat_dictionary(self, json, prefix=None): if type(json) == dict: - for k, v in json.items(): + for k, v in list(json.items()): if prefix is None: - key = k.decode("utf-8").replace(" ", "_") + key = k.replace(" ", "_") else: - key = prefix + "." + k.decode("utf-8").replace(" ", "_") - if hasattr(v, '__iter__'): + key = prefix + "." + k.replace(" ", "_") + if type(v) is list or type(v) is dict: self.resurse_to_flat_dictionary(v, key) else: self.flat_dictionary[key] = str(v).replace(" ", "_") @@ -45,7 +45,7 @@ class Converter(object): index = 0 for v in json: index += 1 - if hasattr(v, '__iter__'): + if type(v) is list or type(v) is dict: self.resurse_to_flat_dictionary( v, prefix + "." + str(index)) else: |