Skip to content
Browse files

[1.0.X] Fixed #6767: corrected a 2.3 compatibility issue in [9750]. T…

…hanks to tlow. Backport of [9761] from trunk.

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 7cef4ec commit 4268ef3fdcb3662e382714f3894bc90eabc37181 @ikelly ikelly committed
Showing with 4 additions and 1 deletion.
  1. +4 −1 django/db/backends/oracle/
5 django/db/backends/oracle/
@@ -7,7 +7,10 @@
import os
import datetime
import time
-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.
os.environ['NLS_LANG'] = '.UTF8'

0 comments on commit 4268ef3

Please sign in to comment.
Something went wrong with that request. Please try again.