summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/dialects
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-05-27 16:34:18 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-05-27 16:34:18 -0400
commit679b3036c2d6c3715ede329aeb82aad17f5cea24 (patch)
treebc00ad371543b03d76e4aa75cfe55d4c3c893926 /lib/sqlalchemy/dialects
parent638803eef1e5dc6e985b176b43bb9cb2a3b5010b (diff)
downloadsqlalchemy-679b3036c2d6c3715ede329aeb82aad17f5cea24.tar.gz
- oracle py3k fix
Diffstat (limited to 'lib/sqlalchemy/dialects')
-rw-r--r--lib/sqlalchemy/dialects/oracle/base.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py
index 4863b7ba1..6b6c32ae0 100644
--- a/lib/sqlalchemy/dialects/oracle/base.py
+++ b/lib/sqlalchemy/dialects/oracle/base.py
@@ -1185,7 +1185,9 @@ class OracleDialect(default.DefaultDialect):
rp = connection.execute(sql.text(text), **params).scalar()
if rp:
- return rp.decode(self.encoding)
+ if util.py2k:
+ rp = rp.decode(self.encoding)
+ return rp
else:
return None