equal
deleted
inserted
replaced
767 timestr = req.form.get(field.input_name(form, 'time')).strip() or None |
767 timestr = req.form.get(field.input_name(form, 'time')).strip() or None |
768 if datestr is None: |
768 if datestr is None: |
769 return None |
769 return None |
770 try: |
770 try: |
771 date = todatetime(req.parse_datetime(datestr, 'Date')) |
771 date = todatetime(req.parse_datetime(datestr, 'Date')) |
772 except ValueError, exc: |
772 except ValueError as exc: |
773 raise ProcessFormError(unicode(exc)) |
773 raise ProcessFormError(unicode(exc)) |
774 if timestr is None: |
774 if timestr is None: |
775 return date |
775 return date |
776 try: |
776 try: |
777 time = req.parse_datetime(timestr, 'Time') |
777 time = req.parse_datetime(timestr, 'Time') |
778 except ValueError, exc: |
778 except ValueError as exc: |
779 raise ProcessFormError(unicode(exc)) |
779 raise ProcessFormError(unicode(exc)) |
780 return date.replace(hour=time.hour, minute=time.minute, second=time.second) |
780 return date.replace(hour=time.hour, minute=time.minute, second=time.second) |
781 |
781 |
782 |
782 |
783 # ajax widgets ################################################################ |
783 # ajax widgets ################################################################ |