mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-04-16 05:14:38 +00:00
Code Issues 32 Releases Wiki Activity

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

Browse Source 
Backpatch of d194f290571f7e9dda7d2fd7a6f2b171120f2f14
This commit is contained in:
Jani Tiainen 2013-01-15 15:05:58 +02:00 committed by Anssi Kääriäinen
parent f6257a147d
commit 457290326f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/db/backends/oracle/base.py
View File

@ -58,10 +58,11 @@ from django.utils import timezone
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