Mercurial > p > mysql-python > mysqldb-2

changeset 49:0a5e28ef7564 MySQLdb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
decimal module always available in Python 2.4 and newer
author adustman
date Sun, 22 Feb 2009 20:03:48 +0000
parents f4fd8c20511c
children 0f9808c4799c
files MySQLdb/converters.py
diffstat 1 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/MySQLdb/converters.py	Sun Feb 22 20:01:31 2009 +0000
+++ b/MySQLdb/converters.py	Sun Feb 22 20:03:48 2009 +0000
@@ -42,6 +42,7 @@
 from types import InstanceType
 import array
 import datetime
+from decimal import Decimal
 
 try:
     set
@@ -134,8 +135,8 @@
     FIELD_TYPE.LONG: int,
     FIELD_TYPE.FLOAT: float,
     FIELD_TYPE.DOUBLE: float,
-    FIELD_TYPE.DECIMAL: float,
-    FIELD_TYPE.NEWDECIMAL: float,
+    FIELD_TYPE.DECIMAL: Decimal,
+    FIELD_TYPE.NEWDECIMAL: Decimal,
     FIELD_TYPE.LONGLONG: int,
     FIELD_TYPE.INT24: int,
     FIELD_TYPE.YEAR: int,
@@ -158,12 +159,6 @@
         ],
     }
 
-try:
-    from decimal import Decimal
-    conversions[FIELD_TYPE.DECIMAL] = Decimal
-    conversions[FIELD_TYPE.NEWDECIMAL] = Decimal
-except ImportError:
-    pass