Changeset 8182 for main/waeup.kofa/trunk/src/waeup/kofa/accesscodes

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/accesscodes

Files:

• accesscode.py (modified) (3 diffs)
• browser.py (modified) (3 diffs)
• tests/test_accesscode.py (modified) (2 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)