diff options
author | Tim Graham <timograham@gmail.com> | 2016-12-29 12:45:25 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-29 12:45:25 -0500 |
commit | fae56427e1987ff8c8bd24d6331007f9c53e7abc (patch) | |
tree | 803b52b29d67667f56689d63f0aa093dcadd3c8c /django/db/backends/oracle/utils.py | |
parent | 5eff8a77838540b27b6bef024dfccfd76008fd4c (diff) | |
download | django-fae56427e1987ff8c8bd24d6331007f9c53e7abc.tar.gz |
Fixed #27649 -- Bumped required cx_Oracle to 5.2.
Removed obsolete workarounds from 1aa48898085ea16915877cc139e238a74e3f554b
and dcf3be7a621f011a918453527406216a738acf68.
Diffstat (limited to 'django/db/backends/oracle/utils.py')
-rw-r--r-- | django/db/backends/oracle/utils.py | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/django/db/backends/oracle/utils.py b/django/db/backends/oracle/utils.py index c63bf39c1c..e89a9b70cb 100644 --- a/django/db/backends/oracle/utils.py +++ b/django/db/backends/oracle/utils.py @@ -1,18 +1,7 @@ import datetime -from django.utils.encoding import force_bytes, force_text - from .base import Database -# Check whether cx_Oracle was compiled with the WITH_UNICODE option if cx_Oracle is pre-5.1. This will -# also be True for cx_Oracle 5.1 and in Python 3.0. See #19606 -if int(Database.version.split('.', 1)[0]) >= 5 and \ - (int(Database.version.split('.', 2)[1]) >= 1 or - not hasattr(Database, 'UNICODE')): - convert_unicode = force_text -else: - convert_unicode = force_bytes - class InsertIdVar(object): """ |