diff options
| author | Ian Kelly <ian.g.kelly@gmail.com> | 2009-01-16 16:51:01 +0000 |
|---|---|---|
| committer | Ian Kelly <ian.g.kelly@gmail.com> | 2009-01-16 16:51:01 +0000 |
| commit | 1c1425130d04d0045b299beffce3363b819cf393 (patch) | |
| tree | a9e1e800d8b8272fe56cdfee8b055fa7d19d255f | |
| parent | f212b24b6469b66424354bf970f3051df180b88d (diff) | |
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
| -rw-r--r-- | django/db/backends/oracle/base.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py index ac09b6f515..6d8816a9d1 100644 --- a/django/db/backends/oracle/base.py +++ b/django/db/backends/oracle/base.py @@ -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' |