dabo Commit
Revision 7117
Date: 2012-03-19 21:51:30 -0700 (Mon, 19 Mar 2012)
Author: Paul
Trac: http://trac.dabodev.com/changeset/7117
Changed:
U trunk/dabo/db/dCursorMixin.py
Log:
Fix correctFieldType changes from last week so that exceptional cases get
reported
without causing NameErrors.
Diff:
Modified: trunk/dabo/db/dCursorMixin.py
===================================================================
--- trunk/dabo/db/dCursorMixin.py 2012-03-13 21:06:25 UTC (rev 7116)
+++ trunk/dabo/db/dCursorMixin.py 2012-03-20 04:51:30 UTC (rev 7117)
@@ -238,9 +238,9 @@
# No conversion needed.
return field_val
- def tryToCorrect(func, *args, **kwargs):
+ def tryToCorrect(func, field_val, field_name):
try:
- return func(*args, **kwargs)
+ return func(field_val)
except Exception, e:
tfv = type(field_val)
dabo.log.info(_("_correctFieldType() failed for
field: "
@@ -250,9 +250,9 @@
# Unicode conversion happens below.
pass
elif pythonType in (datetime.datetime,) and
isinstance(field_val, basestring):
- return tryToCorrect(dates.getDateTimeFromString,
field_val)
+ return tryToCorrect(dates.getDateTimeFromString,
field_val, field_name)
elif pythonType in (datetime.date,) and isinstance(field_val,
basestring):
- return tryToCorrect(dates.getDateFromString,field_val)
+ return tryToCorrect(dates.getDateFromString, field_val,
field_name)
elif pythonType in (Decimal,):
ds = self.DataStructure
_field_val = field_val
@@ -267,10 +267,10 @@
scale = s[5]
if scale is None:
scale = 2
- dec = tryToCorrect(Decimal, _field_val)
+ dec = tryToCorrect(Decimal, _field_val, field_name)
return dec.quantize(Decimal("0.%s" % (scale * "0",)))
else:
- return tryToCorrect(pythonType, field_val)
+ return tryToCorrect(pythonType, field_val, field_name)
# Do the unicode conversion last:
if isinstance(field_val, str) and self._convertStrToUnicode:
_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev
Searchable Archives: http://leafe.com/archives/search/dabo-dev
This message:
http://leafe.com/archives/byMID/[email protected]
