diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-31 10:21:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-31 10:21:39 +0000 |
| commit | e115748d4c26da198eea9292adfa8dd71f1b9f14 (patch) | |
| tree | a03946e9a0c8f19b1ca9a5268ba9bb067ade0676 | |
| parent | 7733f9604da91b466a3620335e4bdaa94cba0938 (diff) | |
| parent | a123dd2f0d39b0187913104f269f385cff84bfd0 (diff) | |
| download | oslo-db-e115748d4c26da198eea9292adfa8dd71f1b9f14.tar.gz | |
Merge "Python 3: Use use_unicode=1 under Python 3"
| -rw-r--r-- | oslo_db/sqlalchemy/engines.py | 5 | ||||
| -rw-r--r-- | oslo_db/tests/sqlalchemy/test_sqlalchemy.py | 18 |
2 files changed, 16 insertions, 7 deletions
diff --git a/oslo_db/sqlalchemy/engines.py b/oslo_db/sqlalchemy/engines.py index 6e041a2..84e4d12 100644 --- a/oslo_db/sqlalchemy/engines.py +++ b/oslo_db/sqlalchemy/engines.py @@ -211,7 +211,10 @@ def _init_connection_args(url, engine_args, **kw): # to internal usage of Python unicode objects in the driver # http://docs.sqlalchemy.org/en/rel_0_9/dialects/mysql.html if 'use_unicode' not in url.query: - engine_args['connect_args']['use_unicode'] = 0 + if six.PY3: + engine_args['connect_args']['use_unicode'] = 1 + else: + engine_args['connect_args']['use_unicode'] = 0 @utils.dispatch_for_dialect('*', multiple=True) diff --git a/oslo_db/tests/sqlalchemy/test_sqlalchemy.py b/oslo_db/tests/sqlalchemy/test_sqlalchemy.py index 671cd27..49f43a1 100644 --- a/oslo_db/tests/sqlalchemy/test_sqlalchemy.py +++ b/oslo_db/tests/sqlalchemy/test_sqlalchemy.py @@ -23,6 +23,7 @@ import fixtures import mock from oslo_config import cfg from oslotest import base as oslo_test +import six import sqlalchemy from sqlalchemy import Column, MetaData, Table from sqlalchemy.engine import url @@ -597,17 +598,23 @@ class CreateEngineTest(oslo_test.BaseTestCase): # no need to specify this self.assertTrue('poolclass' not in self.args) + def _test_mysql_connect_args_default(self, connect_args): + if six.PY3: + self.assertEqual(connect_args, + {'charset': 'utf8', 'use_unicode': 1}) + else: + self.assertEqual(connect_args, + {'charset': 'utf8', 'use_unicode': 0}) + def test_mysql_connect_args_default(self): engines._init_connection_args( url.make_url("mysql://u:p@host/test"), self.args) - self.assertEqual(self.args['connect_args'], - {'charset': 'utf8', 'use_unicode': 0}) + self._test_mysql_connect_args_default(self.args['connect_args']) def test_mysql_oursql_connect_args_default(self): engines._init_connection_args( url.make_url("mysql+oursql://u:p@host/test"), self.args) - self.assertEqual(self.args['connect_args'], - {'charset': 'utf8', 'use_unicode': 0}) + self._test_mysql_connect_args_default(self.args['connect_args']) def test_mysql_pymysql_connect_args_default(self): engines._init_connection_args( @@ -618,8 +625,7 @@ class CreateEngineTest(oslo_test.BaseTestCase): def test_mysql_mysqldb_connect_args_default(self): engines._init_connection_args( url.make_url("mysql+mysqldb://u:p@host/test"), self.args) - self.assertEqual(self.args['connect_args'], - {'charset': 'utf8', 'use_unicode': 0}) + self._test_mysql_connect_args_default(self.args['connect_args']) def test_postgresql_connect_args_default(self): engines._init_connection_args( |