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