Changeset 13478 for main/kofacustom.nigeria/trunk/src/kofacustom

Timestamp:

18 Nov 2015, 15:55:26 (9 years ago)

Author:

uli

Message:

More concise fix of the TZ problem.

• There is no need for try-except. Instead we can properly query the circumstances that lead to TypeError?.

• There is no need to get the utils tzinfo. In case we get a timezone-aware datetime, there is already a timezone available. We should use this timezone then, to ease calculations. Beside this we must take into account the possibility, that local timezone is None.

The new implementaion addresses these problems.

File:

• main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/interswitch/browser.py (modified) (1 diff)

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/interswitch/browser.py

@@ -169 +169 @@
             return _("Payment ticket can't be re-sent to CollegePAY.")
         tz = getUtility(IKofaUtils).tzinfo
-        try:
-            time_delta = datetime.utcnow() - self.context.creation_date
-        except TypeError:
-            # when importing datetimes we are storing offset-aware datetimes
-            # which causes a TypeError
-            now = datetime.now(tz)
-            time_delta = datetime.now(tz) - self.context.creation_date
+        now = datetime.utcnow()
+        if self.context.creation_date.tzinfo is not None:
+            # That's bad. Please store timezone-naive datetimes only!
+            now = self.context.creation_date.tzinfo.localize(now)
+        time_delta = now - self.context.creation_date
         if time_delta.days > 7:
             return _("This payment ticket is too old. Please create a new ticket.")