diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2016-12-05 16:11:54 -0500 |
|---|---|---|
| committer | Ross Brattain <ross.b.brattain@intel.com> | 2017-01-12 18:25:04 -0800 |
| commit | f036e9898a69f5041f9cde02e3652c29e2de1643 (patch) | |
| tree | 36e5eea75811bb640bb30f442f5a3c617e945909 /api/database | |
| parent | 5f0b3d417244397b2d5e61c7a6ddd145f1d25046 (diff) | |
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>
Diffstat (limited to 'api/database')
| -rw-r--r-- | api/database/__init__.py | 1 | ||||
| -rw-r--r-- | api/database/models.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/database/__init__.py b/api/database/__init__.py index 5b0bb05a2..d7cf4f9c4 100644 --- a/api/database/__init__.py +++ b/api/database/__init__.py @@ -6,6 +6,7 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +from __future__ import absolute_import import logging from sqlalchemy import create_engine diff --git a/api/database/models.py b/api/database/models.py index 2fc141c1f..2270de96b 100644 --- a/api/database/models.py +++ b/api/database/models.py @@ -6,6 +6,7 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +from __future__ import absolute_import from sqlalchemy import Column from sqlalchemy import Integer from sqlalchemy import String |