Add support for Python 3

Porting to Python3 using Openstack guidelines:
https://wiki.openstack.org/wiki/Python3

This passes unittests on Python 3.5 and passes opnfv_smoke suite

Updates:
   use six for urlparse and urlopen
   fix exception.message attribute removal
   run unittests on python3
   use unitest.mock on python 3
   fix open mock for vsperf
   fix float division by using delta/eplison comparison
   use unicode in StringIO
   use plugin/sample_config.yaml relative path from test case
   fixed apexlake unittests
   upgraded to mock 2.0.0 to match python3 unittest.mock features
   fixed flake8 issues
   implement safe JSON decode with oslo_serialization.jsonutils.dump_as_bytes()
   implement safe unicode encode/decode with oslo_utils.encodeutils

heat: convert pub key file from bytes to unicode
    pkg_resources returns raw bytes, in python3
    we have to decode this to utf-8 unicode
    so JSON can encode it for heat template

JIRA: YARDSTICK-452

Change-Id: Ib80dd1d0c0eb0592acd832b82f6a7f8f7c20bfda
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/third_party/influxdb/influxdb_line_protocol.py b/third_party/influxdb/influxdb_line_protocol.py
index eee982163..12b010c6b 100644
--- a/third_party/influxdb/influxdb_line_protocol.py
+++ b/third_party/influxdb/influxdb_line_protocol.py
@@ -24,9 +24,12 @@
 # yardstick comment: this file is a modified copy of
 # influxdb-python/influxdb/line_protocol.py
 
+from __future__ import absolute_import
 from __future__ import unicode_literals
+
 from copy import copy
 
+from oslo_utils import encodeutils
 from six import binary_type, text_type, integer_types
 
 
@@ -64,7 +67,7 @@ def _get_unicode(data, force=False):
     Try to return a text aka unicode object from the given data.
     """
     if isinstance(data, binary_type):
-        return data.decode('utf-8')
+        return encodeutils.safe_decode(data, 'utf-8')
     elif data is None:
         return ''
     elif force: