From d2910327c05e2add0f01bba196de154ad3e878e7 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 4 Dec 2015 11:31:55 -0600 Subject: [PATCH] temp fix for IS_DATETIME with timezone info & record versioning causes TypeError: can't compare offset-naive and offset-aware datetimes #1094 --- gluon/validators.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gluon/validators.py b/gluon/validators.py index c8398848..d6f03efd 100644 --- a/gluon/validators.py +++ b/gluon/validators.py @@ -2247,7 +2247,8 @@ class IS_DATETIME(Validator): time.strptime(value, str(self.format)) value = datetime.datetime(y, m, d, hh, mm, ss) if self.timezone is not None: - value = self.timezone.localize(value).astimezone(utc) + # TODO: https://github.com/web2py/web2py/issues/1094 (temporary solution) + value = self.timezone.localize(value).astimezone(utc).replace(tzinfo=None) return (value, None) except: self.extremes.update(IS_DATETIME.nice(self.format))