diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-07 12:50:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-07 12:50:02 +0000 |
| commit | 6a4800d8cc36812835dca796895bafec940b2ce5 (patch) | |
| tree | cb8eedc9470e2a68d86a4863ddf98d200edb093d /openstack/common/db | |
| parent | f9d502228752bcb909e58cafacd1cd948d9a8206 (diff) | |
| parent | fde1e156a38633ce9018569145390bce2047fea8 (diff) | |
| download | oslo-6a4800d8cc36812835dca796895bafec940b2ce5.tar.gz oslo-6a4800d8cc36812835dca796895bafec940b2ce5.tar.xz oslo-6a4800d8cc36812835dca796895bafec940b2ce5.zip | |
Merge "Convert unicode for python3 portability"
Diffstat (limited to 'openstack/common/db')
| -rw-r--r-- | openstack/common/db/sqlalchemy/session.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/openstack/common/db/sqlalchemy/session.py b/openstack/common/db/sqlalchemy/session.py index a19fc01..d2a54ee 100644 --- a/openstack/common/db/sqlalchemy/session.py +++ b/openstack/common/db/sqlalchemy/session.py @@ -246,6 +246,7 @@ import time from eventlet import greenthread from oslo.config import cfg +import six from sqlalchemy import exc as sqla_exc import sqlalchemy.interfaces from sqlalchemy.interfaces import PoolListener @@ -483,7 +484,7 @@ def _add_regexp_listener(dbapi_con, con_record): def regexp(expr, item): reg = re.compile(expr) - return reg.search(unicode(item)) is not None + return reg.search(six.text_type(item)) is not None dbapi_con.create_function('regexp', 2, regexp) |