[SQL-CVS] r3288 - in SQLObject/trunk/sqlobject: . tests
SQLObject is a Python ORM.
Brought to you by:
ianbicking,
phd
|
From: <sub...@co...> - 2008-03-03 16:37:15
|
Author: phd
Date: 2008-03-03 09:37:08 -0700 (Mon, 03 Mar 2008)
New Revision: 3288
Modified:
SQLObject/trunk/sqlobject/col.py
SQLObject/trunk/sqlobject/converters.py
SQLObject/trunk/sqlobject/tests/test_decimal.py
Log:
Decimal module is always available in Python 2.4+.
Modified: SQLObject/trunk/sqlobject/col.py
===================================================================
--- SQLObject/trunk/sqlobject/col.py 2008-03-03 16:35:42 UTC (rev 3287)
+++ SQLObject/trunk/sqlobject/col.py 2008-03-03 16:37:08 UTC (rev 3288)
@@ -1271,10 +1271,7 @@
baseClass = SOTimestampCol
-try:
- from decimal import Decimal
-except ImportError:
- Decimal = float
+from decimal import Decimal
class DecimalValidator(validators.Validator):
def to_python(self, value, state):
Modified: SQLObject/trunk/sqlobject/converters.py
===================================================================
--- SQLObject/trunk/sqlobject/converters.py 2008-03-03 16:35:42 UTC (rev 3287)
+++ SQLObject/trunk/sqlobject/converters.py 2008-03-03 16:37:08 UTC (rev 3288)
@@ -23,13 +23,10 @@
except ImportError:
NumericType = None
+from decimal import Decimal
+from sets import Set, ImmutableSet
from types import ClassType, InstanceType, NoneType
-try:
- from decimal import Decimal
-except ImportError:
- Decimal = None
-
########################################
## Quoting
########################################
@@ -156,7 +153,6 @@
registerConverter(dict, SequenceConverter)
registerConverter(set, SequenceConverter)
registerConverter(frozenset, SequenceConverter)
-from sets import Set, ImmutableSet
registerConverter(Set, SequenceConverter)
registerConverter(ImmutableSet, SequenceConverter)
@@ -183,11 +179,10 @@
registerConverter(datetime.time, TimeConverter)
-if Decimal:
- def DecimalConverter(value, db):
- return value.to_eng_string()
+def DecimalConverter(value, db):
+ return value.to_eng_string()
- registerConverter(Decimal, DecimalConverter)
+registerConverter(Decimal, DecimalConverter)
def sqlrepr(obj, db=None):
try:
Modified: SQLObject/trunk/sqlobject/tests/test_decimal.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_decimal.py 2008-03-03 16:35:42 UTC (rev 3287)
+++ SQLObject/trunk/sqlobject/tests/test_decimal.py 2008-03-03 16:37:08 UTC (rev 3288)
@@ -1,11 +1,7 @@
+from decimal import Decimal
from sqlobject import *
from sqlobject.tests.dbtest import *
-try:
- from decimal import Decimal
-except ImportError:
- Decimal = None
-
########################################
## Decimal columns
########################################
@@ -19,17 +15,16 @@
setupClass(DecimalTable)
d = DecimalTable(col1=21.12)
# psycopg2 returns float as Decimal
- if Decimal and isinstance(d.col1, Decimal):
+ if isinstance(d.col1, Decimal):
assert d.col1 == Decimal("21.12")
else:
assert d.col1 == 21.12
- if Decimal:
- def test_2Decimal():
- """Tests new instance with a Decimal in col1."""
- setupClass(DecimalTable)
- d = DecimalTable(col1=Decimal("21.12"))
- if isinstance(d.col1, Decimal):
- assert d.col1 == Decimal("21.12")
- else:
- assert d.col1 == 21.12
+ def test_2Decimal():
+ """Tests new instance with a Decimal in col1."""
+ setupClass(DecimalTable)
+ d = DecimalTable(col1=Decimal("21.12"))
+ if isinstance(d.col1, Decimal):
+ assert d.col1 == Decimal("21.12")
+ else:
+ assert d.col1 == 21.12
|