[SQL-CVS] r524 - home/phd/SQLObject/inheritance/sqlobject

[<sub...@co...>]

Author: phd
Date: 2005-01-09 11:38:33 +0000 (Sun, 09 Jan 2005)
New Revision: 524

Modified:
   home/phd/SQLObject/inheritance/sqlobject/col.py
Log:
Merged patch from revision 523: DateTime always has 'hour' - test for date by  or  in format.

Modified: home/phd/SQLObject/inheritance/sqlobject/col.py
===================================================================
--- home/phd/SQLObject/inheritance/sqlobject/col.py	2005-01-09 11:37:24 UTC (rev 523)
+++ home/phd/SQLObject/inheritance/sqlobject/col.py	2005-01-09 11:38:33 UTC (rev 524)
@@ -676,7 +676,7 @@
             return value
         if mxdatetime_available: # convert mxDateTime instance to datetime
             if isinstance(value, DateTimeType):
-                if hasattr(value, "hour"):
+                if ("%H" in self.format) or ("%T" in self.format):
                     return datetime.datetime(value.year, value.month, value.day,
                         value.hour, value.minute, value.second)
                 else: