[1.0.X] Fixed #6767: corrected a 2.3 compatibility issue in [9750]. Thanks to tlow. Backport of [9761] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9762 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
7cef4ecd19
commit
4268ef3fdc
django/db/backends/oracle
|
@ -7,7 +7,10 @@ Requires cx_Oracle: http://cx-oracle.sourceforge.net/
|
|||
import os
|
||||
import datetime
|
||||
import time
|
||||
from decimal import Decimal
|
||||
try:
|
||||
from decimal import Decimal
|
||||
except ImportError:
|
||||
from django.utils._decimal import Decimal
|
||||
|
||||
# Oracle takes client-side character set encoding from the environment.
|
||||
os.environ['NLS_LANG'] = '.UTF8'
|
||||
|
|
Loading…
Reference in New Issue