From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 27 May 2013 20:34:18 +0000 (-0400)
Subject: - oracle py3k fix
X-Git-Tag: rel_0_9_0b1~304^2~13^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=679b3036c2d6c3715ede329aeb82aad17f5cea24;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- oracle py3k fix
---

diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py
index 4863b7ba18..6b6c32ae0f 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