diff options
| author | Federico Caselli <cfederico87@gmail.com> | 2021-10-30 22:00:25 +0200 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2021-11-01 15:11:25 -0400 |
| commit | 36e7aebd8d6faac77570403e99f9aa7b2330fa59 (patch) | |
| tree | f45950f61a4b27f128518be52157021ca4f4e8f7 /lib/sqlalchemy/dialects/oracle | |
| parent | a99ea884403de1e1f762e9b1eb635d7fc6ef8e6f (diff) | |
| download | sqlalchemy-36e7aebd8d6faac77570403e99f9aa7b2330fa59.tar.gz | |
First round of removal of python 2
References: #4600
Change-Id: I61e35bc93fe95610ae75b31c18a3282558cd4ffe
Diffstat (limited to 'lib/sqlalchemy/dialects/oracle')
| -rw-r--r-- | lib/sqlalchemy/dialects/oracle/base.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/oracle/cx_oracle.py | 78 |
2 files changed, 13 insertions, 67 deletions
diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py index c0bf985e5..9e62b931d 100644 --- a/lib/sqlalchemy/dialects/oracle/base.py +++ b/lib/sqlalchemy/dialects/oracle/base.py @@ -2468,8 +2468,6 @@ class OracleDialect(default.DefaultDialect): rp = connection.execute(sql.text(text), params).scalar() if rp: - if util.py2k: - rp = rp.decode(self.encoding) return rp else: return None diff --git a/lib/sqlalchemy/dialects/oracle/cx_oracle.py b/lib/sqlalchemy/dialects/oracle/cx_oracle.py index 3e705dced..38e864898 100644 --- a/lib/sqlalchemy/dialects/oracle/cx_oracle.py +++ b/lib/sqlalchemy/dialects/oracle/cx_oracle.py @@ -468,7 +468,6 @@ from ... import processors from ... import types as sqltypes from ... import util from ...engine import cursor as _cursor -from ...util import compat class _OracleInteger(sqltypes.Integer): @@ -745,24 +744,7 @@ class OracleExecutionContext_cx_oracle(OracleExecutionContext): " cx_oracle" % (bindparam.key, bindparam.type) ) - if compat.py2k and dbtype in ( - cx_Oracle.CLOB, - cx_Oracle.NCLOB, - ): - outconverter = ( - processors.to_unicode_processor_factory( - self.dialect.encoding, - errors=self.dialect.encoding_errors, - ) - ) - self.out_parameters[name] = self.cursor.var( - dbtype, - outconverter=lambda value: outconverter( - value.read() - ), - ) - - elif dbtype in ( + if dbtype in ( cx_Oracle.BLOB, cx_Oracle.CLOB, cx_Oracle.NCLOB, @@ -770,18 +752,6 @@ class OracleExecutionContext_cx_oracle(OracleExecutionContext): self.out_parameters[name] = self.cursor.var( dbtype, outconverter=lambda value: value.read() ) - elif compat.py2k and isinstance( - type_impl, sqltypes.Unicode - ): - outconverter = ( - processors.to_unicode_processor_factory( - self.dialect.encoding, - errors=self.dialect.encoding_errors, - ) - ) - self.out_parameters[name] = self.cursor.var( - dbtype, outconverter=outconverter - ) else: self.out_parameters[name] = self.cursor.var(dbtype) self.parameters[0][ @@ -1182,45 +1152,23 @@ class OracleDialect_cx_oracle(OracleDialect): and default_type is not cx_Oracle.CLOB and default_type is not cx_Oracle.NCLOB ): - if compat.py2k: - outconverter = processors.to_unicode_processor_factory( - dialect.encoding, errors=dialect.encoding_errors - ) - return cursor.var( - cx_Oracle.STRING, - size, - cursor.arraysize, - outconverter=outconverter, - ) - else: - return cursor.var( - util.text_type, - size, - cursor.arraysize, - **dialect._cursor_var_unicode_kwargs - ) + return cursor.var( + util.text_type, + size, + cursor.arraysize, + **dialect._cursor_var_unicode_kwargs + ) elif dialect.auto_convert_lobs and default_type in ( cx_Oracle.CLOB, cx_Oracle.NCLOB, ): - if compat.py2k: - outconverter = processors.to_unicode_processor_factory( - dialect.encoding, errors=dialect.encoding_errors - ) - return cursor.var( - cx_Oracle.LONG_STRING, - size, - cursor.arraysize, - outconverter=outconverter, - ) - else: - return cursor.var( - cx_Oracle.LONG_STRING, - size, - cursor.arraysize, - **dialect._cursor_var_unicode_kwargs - ) + return cursor.var( + cx_Oracle.LONG_STRING, + size, + cursor.arraysize, + **dialect._cursor_var_unicode_kwargs + ) elif dialect.auto_convert_lobs and default_type in ( cx_Oracle.BLOB, |