Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.5.x] Fixed #19606 -- Adjusted cx_Oracle unicode detection.

Backpatch of d194f29
  • Loading branch information...
commit 457290326fa38297467922d827c630ae2026e88b 1 parent f6257a1
Jani Tiainen authored akaariai committed
Showing with 5 additions and 4 deletions.
  1. +5 −4 django/db/backends/oracle/base.py
9 django/db/backends/oracle/base.py
View
@@ -58,10 +58,11 @@ def _setup_environment(environ):
DatabaseError = Database.DatabaseError
IntegrityError = Database.IntegrityError
-
-# Check whether cx_Oracle was compiled with the WITH_UNICODE option. This will
-# also be True in Python 3.0.
-if int(Database.version.split('.', 1)[0]) >= 5 and not hasattr(Database, 'UNICODE'):
+# 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
Please sign in to comment.
Something went wrong with that request. Please try again.