dabo Commit
Revision 6731
Date: 2011-08-05 11:00:42 -0700 (Fri, 05 Aug 2011)
Author: Jacekk
Trac: http://trac.dabodev.com/changeset/6731
Changed:
U trunk/dabo/ui/uiwx/dDatePicker.py
Log:
Replaced mktime() function with less problematic code.
Diff:
Modified: trunk/dabo/ui/uiwx/dDatePicker.py
===================================================================
--- trunk/dabo/ui/uiwx/dDatePicker.py 2011-08-05 16:01:02 UTC (rev 6730)
+++ trunk/dabo/ui/uiwx/dDatePicker.py 2011-08-05 18:00:42 UTC (rev 6731)
@@ -10,17 +10,17 @@
dabo.ui.loadUI("wx")
import dabo.dEvents as dEvents
import dDataControlMixin as dcm
-from time import mktime
from dabo.dLocalize import _
from dabo.lib.utils import ustr
from dabo.ui import makeDynamicProperty
def dateTimePy2Wx(date):
- if isinstance(date, (datetime.datetime, datetime.date)):
- retVal = wx.DateTimeFromTimeT(mktime(date.timetuple()))
- if isinstance(date, datetime.datetime):
- retVal.SetMillisecond(date.microsecond)
+ if isinstance(date, datetime.date):
+ retVal = wx.DateTimeFromDMY(date.day, date.month, date.year)
+ elif isinstance(date, datetime.datetime):
+ retVal = wx.DateTimeFromDMY(date.day, date.month, date.year,
date.hour,
+ date.minute, date.second, date.microsecond)
else:
retVal = date
return retVal
@@ -359,6 +359,7 @@
if __name__ == "__main__":
+ import datetime
import test
class TestBase(dDatePicker):
@@ -366,5 +367,5 @@
def onValueChanged(self, evt):
print "onValueChanged"
- test.Test().runTest(TestBase, AllowNullDate=True)
+ test.Test().runTest(TestBase, AllowNullDate=True,
Value=datetime.date(1940,01,01))
test.Test().runTest(TestBase, BackColor="orange", PickerMode="Spin",
AllowNullDate=True)
_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev
Searchable Archives: http://leafe.com/archives/search/dabo-dev
This message:
http://leafe.com/archives/byMID/[email protected]
