dabo Commit
Revision 3944
Date: 2008-03-05 13:59:53 -0800 (Wed, 05 Mar 2008)
Author: Paul
Trac: http://svn.dabodev.com/trac/dabo/changeset/3944
Changed:
U trunk/dabo/lib/dates.py
U trunk/dabo/lib/test/test_dates.py
Log:
Fixed getDateTimeFromString(), and added some simple test cases.
Thanks Simen Haugen.
Diff:
Modified: trunk/dabo/lib/dates.py
===================================================================
--- trunk/dabo/lib/dates.py 2008-03-04 12:54:02 UTC (rev 3943)
+++ trunk/dabo/lib/dates.py 2008-03-05 21:59:53 UTC (rev 3944)
@@ -159,7 +159,7 @@
# user's locale into account.
fmt = "%x %X"
## note: don't use dt.strftime(), as it doesn't handle < 1900
- return time.strftime(fmt, (dt.year, dt.month, dt.day, dt.hour,
dt.minute, dt.second, dt.microsecond, 0, 0))
+ return time.strftime(fmt, dt.timetuple())
def getDateTimeFromString(strVal, formats=None):
Modified: trunk/dabo/lib/test/test_dates.py
===================================================================
--- trunk/dabo/lib/test/test_dates.py 2008-03-04 12:54:02 UTC (rev 3943)
+++ trunk/dabo/lib/test/test_dates.py 2008-03-05 21:59:53 UTC (rev 3944)
@@ -23,7 +23,28 @@
for test in tests:
self.assertEqual(dates.getDateFromString(test[1],
test[0]), test[2])
+ def test_getDateTimeFromString(self):
+ formats = ["ISO8601", "YYYYMMDDHHMMSS"]
+ tests = ["0503", "20060503", "2006-05-03", "060503"]
+ expected_date = datetime.datetime(year, 05, 03, 12, 15, 00)
+ tests = ((["ISO8601"], "%s-05-03 12:15:00" % year_str4,
expected_date),
+ (["YYYYMMDDHHMMSS"], "%s0503121500" % year_str4,
expected_date))
+ for test in tests:
+ self.assertEqual(dates.getDateTimeFromString(test[1],
test[0]), test[2])
+
+ def test_getStringFromDate(self):
+ test_str = "2006-05-03"
+ test_date = dates.getDateFromString(test_str)
+ dabo.settings.dateFormat = "%Y-%m-%d"
+ self.assertEqual(dates.getStringFromDate(test_date), test_str)
+
+ def test_getStringFromDateTime(self):
+ test_str = "2006-05-03 12:15:00"
+ test_datetime = dates.getDateTimeFromString(test_str)
+ dabo.settings.dateTimeFormat = "%Y-%m-%d %H:%M:%S"
+ self.assertEqual(dates.getStringFromDateTime(test_datetime),
test_str)
+
def test_goDate(self):
self.assertEqual(dates.goDate(datetime.date(2006, 05, 03), 10),
datetime.date(2006, 05, 13))
self.assertEqual(dates.goDate(datetime.datetime(2006, 05, 03,
12, 15, 23), 10), datetime.datetime(2006, 05, 13, 12, 15, 23))
_______________________________________________
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/dabo-dev/[EMAIL PROTECTED]
