openstack/deb-python-taskflow
Code Issues Proposed changes

Use six.text_type() instead of str() in sqlalchemy backend

Browse Source 
Change-Id: Ie78d2890ce008f22c94e705dbb489838375d303d
This commit is contained in:
Joshua Harlow
2014-02-14 14:40:23 -08:00
committed by Joshua Harlow
parent 0cd1005741
commit 461991d9ec
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
taskflow/persistence/backends/impl_sqlalchemy.py
View File

@@ -26,6 +26,7 @@ import copy
import logging import logging
import time import time
import six
import sqlalchemy as sa import sqlalchemy as sa
from sqlalchemy import exc as sa_exc from sqlalchemy import exc as sa_exc
from sqlalchemy import orm as sa_orm from sqlalchemy import orm as sa_orm
@@ -101,7 +102,7 @@ SQLITE_IN_MEMORY = ('sqlite://', 'sqlite:///', 'sqlite:///:memory:')
def _in_any(reason, err_haystack): def _in_any(reason, err_haystack):
"""Checks if any elements of the haystack are in the given reason.""" """Checks if any elements of the haystack are in the given reason."""
for err in err_haystack: for err in err_haystack:
if reason.find(str(err)) != -1: if reason.find(six.text_type(err)) != -1:
return True return True
return False return False
@@ -142,10 +143,10 @@ def _ping_listener(dbapi_conn, connection_rec, connection_proxy):
try: try:
dbapi_conn.cursor().execute('select 1') dbapi_conn.cursor().execute('select 1')
except dbapi_conn.OperationalError as ex: except dbapi_conn.OperationalError as ex:
if _in_any(str(ex.args[0]), MY_SQL_GONE_WAY_AWAY_ERRORS): if _in_any(six.text_type(ex.args[0]), MY_SQL_GONE_WAY_AWAY_ERRORS):
LOG.warn('Got mysql server has gone away: %s', ex) LOG.warn('Got mysql server has gone away: %s', ex)
raise sa_exc.DisconnectionError("Database server went away") raise sa_exc.DisconnectionError("Database server went away")
elif _in_any(str(ex.args[0]), POSTGRES_GONE_WAY_AWAY_ERRORS): elif _in_any(six.text_type(ex.args[0]), POSTGRES_GONE_WAY_AWAY_ERRORS):
LOG.warn('Got postgres server has gone away: %s', ex) LOG.warn('Got postgres server has gone away: %s', ex)
raise sa_exc.DisconnectionError("Database server went away") raise sa_exc.DisconnectionError("Database server went away")
else: else:
@@ -268,7 +269,7 @@ class Connection(base.Connection):
with contextlib.closing(self._engine.connect()): with contextlib.closing(self._engine.connect()):
pass pass
except sa_exc.OperationalError as ex: except sa_exc.OperationalError as ex:
if _is_db_connection_error(str(ex.args[0])): if _is_db_connection_error(six.text_type(ex.args[0])):
failures.append(misc.Failure()) failures.append(misc.Failure())
return False return False
return True return True