From fde1e156a38633ce9018569145390bce2047fea8 Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Wed, 1 May 2013 11:22:23 -0500 Subject: Convert unicode for python3 portability From http://docs.python.org/3.1/whatsnew/3.0.html: "Python 3.0 uses the concepts of text and (binary) data instead of Unicode strings and 8-bit strings." Use six.text_type to Type for representing (Unicode) textual data. This is unicode() in Python 2 and str in Python 3. Change-Id: I3da268a714a34a8e626a2590f01b86e414dc3411 Signed-off-by: Chuck Short --- openstack/common/db/sqlalchemy/session.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'openstack/common/db/sqlalchemy/session.py') 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) -- cgit