# HG changeset patch
# User Florent <florent@secondweb.fr>
# Date 1240386354 -7200
# Node ID b7494ff85e16aed16d6081d96dbf9310bbdaba9f
# Parent  674fa3eb01d182bc38fcc1d5a764ce4eede689e8# Parent  ff6758d7b96f4f6429fdae4ddb2b60dbed342c1d
merge

diff -r ff6758d7b96f -r b7494ff85e16 web/controller.py
--- a/web/controller.py	Fri Apr 17 12:13:16 2009 +0200
+++ b/web/controller.py	Wed Apr 22 09:45:54 2009 +0200
@@ -7,7 +7,7 @@
 """
 __docformat__ = "restructuredtext en"
 
-from datetime import timedelta
+import datetime
 
 from cubicweb import typed_eid
 from cubicweb.utils import strptime
@@ -126,12 +126,13 @@
             try:
                 # (adim) I can't find a way to parse a Time with a custom format
                 date = strptime(value, format) # this returns a DateTime
-                return timedelta(0, date.hour *60*60 + date.minute*60 + date.second, 0)
+                return datetime.timedelta(0, date.hour *60*60 + date.minute*60 + date.second, 0)
             except:
                 raise ValueError('can\'t parse %r (expected %s)' % (value, format))
         try:
             format = self.req.property_value('ui.date-format')
-            return strptime(value, format)
+            dt = strptime(value, format)
+            return datetime.date(dt.year, dt.month, dt.day)
         except:
             raise ValueError('can\'t parse %r (expected %s)' % (value, format))