diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-05-03 19:32:34 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-05-03 19:32:34 -0400 |
| commit | 41d2e24c4ab6cf58f922c8c1c0eb7a6ac593168e (patch) | |
| tree | 5a6efcae0ba5ba23310a563e9b8ff94301955504 /lib/sqlalchemy/dialects/oracle | |
| parent | 9d34c64095b6bed4b36aaea5d0d0e485fcb15d58 (diff) | |
| parent | c4bb1f7ba27aa19e1228f85419208d547ce161e6 (diff) | |
| download | sqlalchemy-41d2e24c4ab6cf58f922c8c1c0eb7a6ac593168e.tar.gz | |
merge tip
Diffstat (limited to 'lib/sqlalchemy/dialects/oracle')
| -rw-r--r-- | lib/sqlalchemy/dialects/oracle/cx_oracle.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/sqlalchemy/dialects/oracle/cx_oracle.py b/lib/sqlalchemy/dialects/oracle/cx_oracle.py index dd6763c09..e82100872 100644 --- a/lib/sqlalchemy/dialects/oracle/cx_oracle.py +++ b/lib/sqlalchemy/dialects/oracle/cx_oracle.py @@ -122,6 +122,8 @@ class _LOBMixin(object): return process class _NativeUnicodeMixin(object): + # Py3K + #pass # Py2K def bind_processor(self, dialect): if dialect._cx_oracle_with_unicode: @@ -505,6 +507,10 @@ 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: |