aboutsummaryrefslogtreecommitdiffstats
path: root/functest/energy
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-12-12 05:36:53 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2017-12-12 05:48:09 +0100
commit55733974628202786705227b7d6e9bb50558823d (patch)
treec5c097b8c00c0f1577f0c35eccf250fdf14c47ec /functest/energy
parent9a74aa7683d34e6954eb5d0bd54253935c975c59 (diff)
Add python3 support in energy
It also converts Exception to str when expected. All energy modules are also listed in files rated 10/10 by pylint. Change-Id: Id382d60eb35f50c98b15423f9559a920ce5dac62 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/energy')
-rw-r--r--functest/energy/energy.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/functest/energy/energy.py b/functest/energy/energy.py
index 119942bb..2835e05c 100644
--- a/functest/energy/energy.py
+++ b/functest/energy/energy.py
@@ -12,10 +12,10 @@
import json
import logging
-import urllib
from functools import wraps
import requests
+from six.moves import urllib
from functest.utils.constants import CONST
import functest.utils.functest_utils as ft_utils
@@ -103,7 +103,7 @@ class EnergyRecorder(object):
assert environment
uri_comp = "/recorders/environment/"
- uri_comp += urllib.quote_plus(environment)
+ uri_comp += urllib.parse.quote_plus(environment)
# Creds
creds_usr = ft_utils.get_functest_config(
@@ -130,7 +130,7 @@ class EnergyRecorder(object):
except Exception as exc: # pylint: disable=broad-except
EnergyRecorder.logger.info(
"Energy recorder API is not available, cause=%s",
- exc.message)
+ str(exc))
api_available = False
# Final config
EnergyRecorder.energy_recorder_api = {