Changeset 8194 for main/waeup.kofa/trunk/src/waeup/kofa/students

Timestamp:

17 Apr 2012, 11:40:06 (13 years ago)

Author:

Henrik Bettermann

Message:

Store utc without tzinfo in persistent datetime objects. Localisation will be done in views only.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

• accommodation.py (modified) (1 diff)
• browser.py (modified) (1 diff)
• tests/test_browser.py (modified) (1 diff)
• tests/test_student.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/students/accommodation.py

@@ -62 +62 @@
     def __init__(self):
         super(BedTicket, self).__init__()
-        tz = getUtility(IKofaUtils).tzinfo
-        self.booking_date = datetime.now(tz)
+        self.booking_date = datetime.utcnow()
         self.bed = None
         return

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -1145 +1145 @@
         self.context.r_code = u'00'
         self.context.p_state = 'paid'
-        tz = getUtility(IKofaUtils).tzinfo
-        self.context.payment_date = datetime.now(tz)
+        self.context.payment_date = datetime.utcnow()
         if self.context.p_category == 'clearance':
             # Create CLR access code

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -121 +121 @@
         # Create 5 access codes with prefix'PWD'
         pin_container = self.app['accesscodes']
-        tz = getUtility(IKofaUtils).tzinfo
         pin_container.createBatch(
-            datetime.now(tz), 'some_userid', 'PWD', 9.99, 5)
+            datetime.utcnow(), 'some_userid', 'PWD', 9.99, 5)
         pins = pin_container['PWD-1'].values()
         self.pwdpins = [x.representation for x in pins]

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_student.py

@@ -80 +80 @@
     def test_booking_date(self):
         isinstance(self.bedticket.booking_date.tzinfo, tzinfo)
-        self.assertEqual(str(self.bedticket.booking_date.tzinfo), 'UTC')
+        self.assertEqual(self.bedticket.booking_date.tzinfo, None)
         return