Changeset 8182

Timestamp:

16 Apr 2012, 20:56:59 (13 years ago)

Author:

Henrik Bettermann

Message:

Part 1: Add tzinfo to all persistent datetime objects.

Location:

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

Files:

• accesscodes/accesscode.py (modified) (3 diffs)
• accesscodes/browser.py (modified) (3 diffs)
• accesscodes/tests/test_accesscode.py (modified) (2 diffs)
• applicants/browser.py (modified) (1 diff)
• payments/payment.py (modified) (2 diffs)
• students/accommodation.py (modified) (2 diffs)
• students/browser.py (modified) (1 diff)
• students/interfaces.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/accesscode.py

@@ -31 +31 @@
 from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
 from random import SystemRandom as random
-from waeup.kofa.interfaces import IKofaPluggable, IObjectHistory
+from zope.component import getUtility
+from waeup.kofa.interfaces import IKofaUtils, IKofaPluggable, IObjectHistory
 from waeup.kofa.utils.logger import Logger
 from waeup.kofa.accesscodes.interfaces import (
@@ -353 +354 @@
         if batch_name in self.keys():
             raise KeyError('Batch already exists: %s' % batch_name)
+        tz = getUtility(IKofaUtils).tzinfo
         batch = AccessCodeBatch(
-            datetime.now(), creator, prefix, cost, 0, num=num)
+            datetime.now(tz), creator, prefix, cost, 0, num=num)
         num_entries = 0
         self[batch_name] = batch
@@ -426 +428 @@
         creator = 'system'
         entry_num = 0
-        creation_date = datetime.now()
+        tz = getUtility(IKofaUtils).tzinfo
+        creation_date = datetime.now(tz)
         basecontainer.createBatch(creation_date, creator,
             'SFE', cost, entry_num)

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

@@ -20 +20 @@
 import grok
 from datetime import datetime
+from zope.component import getUtility
 from hurry.workflow.interfaces import InvalidTransitionError
 from waeup.kofa.browser.resources import datatable
@@ -26 +27 @@
 from waeup.kofa.browser.viewlets import (
     AdminTask, AddActionButton, SearchActionButton, BatchOpButton, ManageLink)
-from waeup.kofa.interfaces import IKofaObject
+from waeup.kofa.interfaces import IKofaObject, IKofaUtils
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.accesscodes.interfaces import (
@@ -84 +85 @@
     def createBatch(self, **data):
         creator = self.request.principal.id
-        creation_date = datetime.now()
+        tz = getUtility(IKofaUtils).tzinfo
+        creation_date = datetime.now(tz)
         data.update(creation_date=creation_date, creator=creator)
         batch = self.context.createBatch(**data)

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/tests/test_accesscode.py

@@ -25 +25 @@
 from datetime import datetime
 from hurry.workflow.interfaces import InvalidTransitionError, IWorkflowState
+from zope.component import getUtility
 from zope.component.hooks import setSite, clearSite
 from zope.interface.verify import verifyObject, verifyClass
 from zope.testing import renormalizing
 from waeup.kofa.app import University
-from waeup.kofa.interfaces import IObjectHistory, IKofaPluggable
+from waeup.kofa.interfaces import IObjectHistory, IKofaPluggable, IKofaUtils
 from waeup.kofa.testing import (
     FunctionalLayer, FunctionalTestCase, setUp, tearDown, getRootFolder)
@@ -258 +259 @@
         self.app = self.getRootFolder()['app']
 
+        tz = getUtility(IKofaUtils).tzinfo
         batch = AccessCodeBatch(    # create batch with zero entries
-            datetime.now(), 'testuser', 'FOO', 9.99, 0)
+            datetime.now(tz), 'testuser', 'FOO', 9.99, 0)
         self.app['accesscodes'].addBatch(batch)
 

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

@@ -521 +521 @@
         self.context.r_code = u'00'
         self.context.p_state = 'paid'
-        self.context.payment_date = datetime.now()
+        tz = getUtility(IKofaUtils).tzinfo
+        self.context.payment_date = datetime.now(tz)
         ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
         self.context.__parent__.loggerInfo(

main/waeup.kofa/trunk/src/waeup/kofa/payments/payment.py

@@ -22 +22 @@
 from datetime import datetime
 from grok import index
+from zope.component import getUtility
+from waeup.kofa.interfaces import IKofaUtils
 from waeup.kofa.payments.interfaces import (
     IPayment, ISCPayment, IOnlinePayment,
@@ -36 +38 @@
     def __init__(self):
         super(Payment, self).__init__()
-        self.creation_date = datetime.now()
+        try:
+            tz = getUtility(IKofaUtils).tzinfo
+        except:
+            #In unit tests KofaUtils is not available.
+            tz = None
+        self.creation_date = datetime.now(tz)
         self.p_id = None
         return

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

@@ -21 +21 @@
 from datetime import datetime
 import grok
+from zope.component import getUtility
 from zope.component.interfaces import IFactory
 from zope.interface import implementedBy
-from waeup.kofa.interfaces import academic_sessions_vocab
+from waeup.kofa.interfaces import academic_sessions_vocab, IKofaUtils
 from waeup.kofa.students.interfaces import (
     IStudentAccommodation, IStudentNavigation, IBedTicket)
@@ -61 +62 @@
     def __init__(self):
         super(BedTicket, self).__init__()
-        self.booking_date = datetime.now()
+        tz = getUtility(IKofaUtils).tzinfo
+        self.booking_date = datetime.now(tz)
         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'
-        self.context.payment_date = datetime.now()
+        tz = getUtility(IKofaUtils).tzinfo
+        self.context.payment_date = datetime.now(tz)
         if self.context.p_category == 'clearance':
             # Create CLR access code

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

@@ -379 +379 @@
         )
 
+    def addCourseTicket(courseticket):
+        """Add a course ticket object.
+        """
+
+    def getStudent():
+        """Return student
+        """
+
 class ICourseTicket(IKofaObject):
     """A course ticket.

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

@@ -26 +26 @@
 import grok
 from zope.event import notify
-from zope.component import createObject, queryUtility
+from zope.component import createObject, queryUtility, getUtility
 from zope.component.hooks import setSite, clearSite
 from zope.catalog.interfaces import ICatalog
@@ -40 +40 @@
 from waeup.kofa.university.faculty import Faculty
 from waeup.kofa.university.department import Department
-from waeup.kofa.interfaces import IUserAccount
+from waeup.kofa.interfaces import IUserAccount, IKofaUtils
 from waeup.kofa.authentication import LocalRoleSetEvent
 from waeup.kofa.hostels.hostel import Hostel, Bed, NOT_OCCUPIED
@@ -121 +121 @@
         # Create 5 access codes with prefix'PWD'
         pin_container = self.app['accesscodes']
+        tz = getUtility(IKofaUtils).tzinfo
         pin_container.createBatch(
-            datetime.now(), 'some_userid', 'PWD', 9.99, 5)
+            datetime.now(tz), 'some_userid', 'PWD', 9.99, 5)
         pins = pin_container['PWD-1'].values()
         self.pwdpins = [x.representation for x in pins]