Merge lp:~sidnei/storm/datetime-in-datevariable into lp:storm

[Sidnei da Silva]

Converts datetime() object coming from db into a date() object.

[James Henstridge (jamesh)]

Looks good. Don't forget to update the NEWS file though.

review: Approve

[lp:~sidnei/storm/datetime-in-datevariable]

387. By Sidnei da Silva on 2011-01-19

- Add NEWS entry

[Jamu Kakar (jkakar)]

Nice work, +1!

review: Approve

=== modified file 'NEWS'
--- NEWS	2011-01-06 03:29:10 +0000
+++ NEWS	2011-01-19 01:56:27 +0000
@@ -11,7 +11,9 @@
  - When retrieving and using an object with Store.get(), Storm will no
    longer issue two queries when there is a live invalidated object
    (bug #697513).
-
+ - When a datetime object is returned by the database driver,
+   DateVariable failed to detect and convert it to a date() object
+   (bug #391601).
 
 
 0.18 (2010-10-25)

=== modified file 'storm/variables.py'
--- storm/variables.py	2010-06-01 08:12:07 +0000
+++ storm/variables.py	2011-01-19 01:56:27 +0000
@@ -436,6 +436,8 @@
         if from_db:
             if value is None:
                 return None
+            if isinstance(value, datetime):
+                return value.date()
             if isinstance(value, date):
                 return value
             if not isinstance(value, (str, unicode)):

=== modified file 'tests/variables.py'
--- tests/variables.py	2009-03-04 16:56:58 +0000
+++ tests/variables.py	2011-01-19 01:56:27 +0000
@@ -554,6 +554,7 @@
         date_str = "1977-05-04"
         date_uni = unicode(date_str)
         date_obj = date(1977, 5, 4)
+        datetime_obj = datetime(1977, 5, 4, 0, 0, 0)
 
         variable = DateVariable()
 
@@ -563,6 +564,8 @@
         self.assertEquals(variable.get(), date_obj)
         variable.set(date_obj, from_db=True)
         self.assertEquals(variable.get(), date_obj)
+        variable.set(datetime_obj, from_db=True)
+        self.assertEquals(variable.get(), date_obj)
 
         self.assertRaises(TypeError, variable.set, 0, from_db=True)
         self.assertRaises(TypeError, variable.set, marker, from_db=True)