From 1c1425130d04d0045b299beffce3363b819cf393 Mon Sep 17 00:00:00 2001 From: Ian Kelly Date: Fri, 16 Jan 2009 16:51:01 +0000 Subject: [PATCH] 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 --- django/db/backends/oracle/base.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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'