Author: ikelly Date: 2009-01-16 10:53:12 -0600 (Fri, 16 Jan 2009) New Revision: 9762
Modified: django/branches/releases/1.0.X/ django/branches/releases/1.0.X/django/db/backends/oracle/base.py Log: [1.0.X] Fixed #6767: corrected a 2.3 compatibility issue in [9750]. Thanks to tlow. Backport of [9761] from trunk. Property changes on: django/branches/releases/1.0.X ___________________________________________________________________ Name: svnmerge-integrated - /django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9462,9466-9469,9471-9488,9491-9526,9529,9533-9536,9539-9550,9556-9557,9559-9560,9562-9568,9570-9591,9595-9619,9621-9624,9626-9636,9638-9642,9644-9645,9647-9689,9691,9693-9699,9703-9706,9709-9713,9716-9723,9725-9726,9730-9733,9750 + /django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9462,9466-9469,9471-9488,9491-9526,9529,9533-9536,9539-9550,9556-9557,9559-9560,9562-9568,9570-9591,9595-9619,9621-9624,9626-9636,9638-9642,9644-9645,9647-9689,9691,9693-9699,9703-9706,9709-9713,9716-9723,9725-9726,9730-9733,9750,9761 Modified: django/branches/releases/1.0.X/django/db/backends/oracle/base.py =================================================================== --- django/branches/releases/1.0.X/django/db/backends/oracle/base.py 2009-01-16 16:51:01 UTC (rev 9761) +++ django/branches/releases/1.0.X/django/db/backends/oracle/base.py 2009-01-16 16:53:12 UTC (rev 9762) @@ -7,7 +7,10 @@ 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' --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Django updates" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/django-updates?hl=en -~----------~----~----~----~------~----~------~--~---
