← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/webapp/base/forms.py

  • Committer: William Grant
  • Date: 2010-07-27 12:09:13 UTC
  • mto: This revision was merged to the branch mainline in revision 1826.
  • Revision ID: grantw@unimelb.edu.au-20100727120913-v0kfnwxzbiwrjnue
(simple)json always returns a unicode when decoding, while cjson returned a str where possible. This makes cPickle unhappy, so convert back to a str.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/base/forms.py
127
127
        try:
128
128
            return datetime.datetime.strptime(value, "%Y-%m-%d %H:%M:%S")
129
129
        except ValueError, e:
130
 
            raise formencode.Invalid(str(e) + " -> " + repr(value), value, state)
131
130
            raise formencode.Invalid("Must be a timestamp in "
132
131
                "YYYY-MM-DD HH:MM:SS format", value, state)
133
132
    def _from_python(self, value, state):