diff options
| author | Ian Kelly <ian.g.kelly@gmail.com> | 2009-01-16 16:53:12 +0000 |
|---|---|---|
| committer | Ian Kelly <ian.g.kelly@gmail.com> | 2009-01-16 16:53:12 +0000 |
| commit | 4268ef3fdcb3662e382714f3894bc90eabc37181 (patch) | |
| tree | 67fb0adbe5257ea86792d9430f1915d890dd0445 | |
| parent | 7cef4ecd19b83e6592a1afaedf6aff6fcb7b9e6e (diff) | |
[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
| -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' |