← Back to branch summary

~iffy/storm/stringbug

« back to all changes in this revision

Viewing changes to storm/variables.py

  • Committer: Sidnei da Silva
  • Date: 2011-01-19 15:58:50 UTC
  • mfrom: (385.1.2 datetime-in-datevariable)
  • Revision ID: sidnei.da.silva@canonical.com-20110119155850-px1ko9na2992ajm7
Merged datetime-in-datevariable [r=jamesh,jkakar][f=391601]

When a datetime object is returned by the database driver,
DateVariable failed to detect and convert it to a date()
object.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storm/variables.py
436
436
        if from_db:
437
437
            if value is None:
438
438
                return None
 
439
            if isinstance(value, datetime):
 
440
                return value.date()
439
441
            if isinstance(value, date):
440
442
                return value
441
443
            if not isinstance(value, (str, unicode)):