From: Jason Kirtland <jek@discorporate.us>
Date: Sun, 18 Nov 2007 19:01:42 +0000 (+0000)
Subject: - Clarified use of python's Decimal
X-Git-Tag: rel_0_4_1~6
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d3f6ae2332a546967469eb2953a080537dff68c6;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Clarified use of python's Decimal
---

diff --git a/lib/sqlalchemy/types.py b/lib/sqlalchemy/types.py
index b275309876..0f93b8e349 100644
--- a/lib/sqlalchemy/types.py
+++ b/lib/sqlalchemy/types.py
@@ -17,7 +17,7 @@ import inspect
 import datetime as dt
 
 from sqlalchemy import exceptions
-from sqlalchemy.util import Decimal, pickle
+from sqlalchemy.util import pickle, Decimal as _python_Decimal
 
 class _UserTypeAdapter(type):
     """adapts 0.3 style user-defined types with convert_bind_param/convert_result_value
@@ -384,7 +384,7 @@ class Numeric(TypeEngine):
         if self.asdecimal:
             def process(value):
                 if value is not None:
-                    return Decimal(str(value))
+                    return _python_Decimal(str(value))
                 else:
                     return value
             return process