- oracle_xe 5 doesn't accept a Python unicode object in

its connect string in normal Python 2.x mode - so we coerce
to str() directly.  non-ascii characters aren't supported
in connect strings here since we don't know what encoding
we could use.  [ticket:1670]

diff --git a/CHANGES b/CHANGES
index a47f37289f120fd91a6a162c19dc217754254d50..e66480da51f041b1fd6bb5aef88c172510702b72 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -29,6 +29,12 @@ CHANGES
     be used.   This will impact decimal accuracy and some
     unicode handling issues.  [ticket:1775]
 
+  - oracle_xe 5 doesn't accept a Python unicode object in 
+    its connect string in normal Python 2.x mode - so we coerce
+    to str() directly.  non-ascii characters aren't supported
+    in connect strings here since we don't know what encoding
+    we could use.  [ticket:1670]
+
 - firebird
   - Added a label to the query used within has_table() and 
     has_sequence() to work with older versions of Firebird

diff --git a/lib/sqlalchemy/dialects/oracle/cx_oracle.py b/lib/sqlalchemy/dialects/oracle/cx_oracle.py
index dd6763c09666c3750f0706d87358c0beeb7eb74e..80c0cc67f1aca8d5ac7f85c7fa8794fcc02a24c0 100644 (file)
--- a/lib/sqlalchemy/dialects/oracle/cx_oracle.py
+++ b/lib/sqlalchemy/dialects/oracle/cx_oracle.py
@@ -505,6 +505,11 @@ class OracleDialect_cx_oracle(OracleDialect):
             for k, v in opts.items():
                 if isinstance(v, str):
                     opts[k] = unicode(v)
+        else:
+            for k, v in opts.items():
+                if isinstance(v, unicode):
+                    opts[k] = str(v)
+          
         # end Py2K
 
         if 'mode' in url.query: