[Python-checkins] python/nondist/sandbox/datetime obj_timetz.c,1.13,1.14 test_both.py,1.61,1.62 test_datetime.py,1.62,1.63
tim_one@users.sourceforge.net
tim_one@users.sourceforge.net
Wed, 11 Dec 2002 17:57:02 -0800
Update of /cvsroot/python/python/nondist/sandbox/datetime
In directory sc8-pr-cvs1:/tmp/cvs-serv23865
Modified Files:
obj_timetz.c test_both.py test_datetime.py
Log Message:
Moved more timetz tests into test_both.
Since I went thru all the work of writing a timetz richcompare, may as
well use it.
Index: obj_timetz.c
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/datetime/obj_timetz.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** obj_timetz.c 12 Dec 2002 01:30:47 -0000 1.13
--- obj_timetz.c 12 Dec 2002 01:57:00 -0000 1.14
***************
*** 393,397 ****
0, /* tp_traverse */
0, /* tp_clear */
! (richcmpfunc)time_richcompare, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
--- 393,397 ----
0, /* tp_traverse */
0, /* tp_clear */
! (richcmpfunc)timetz_richcompare, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
Index: test_both.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/datetime/test_both.py,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** test_both.py 12 Dec 2002 01:38:26 -0000 1.61
--- test_both.py 12 Dec 2002 01:57:00 -0000 1.62
***************
*** 1476,1479 ****
--- 1476,1520 ----
self.failUnless(t.tzinfo is b)
+ def test_zones(self):
+ est = FixedOffset(-300, "EST")
+ utc = FixedOffset(0, "UTC")
+ met = FixedOffset(60, "MET")
+ t1 = timetz( 7, 47, tzinfo=est)
+ t2 = timetz(12, 47, tzinfo=utc)
+ t3 = timetz(13, 47, tzinfo=met)
+ self.assertEqual(t1.tzinfo, est)
+ self.assertEqual(t2.tzinfo, utc)
+ self.assertEqual(t3.tzinfo, met)
+ # XXX The commented-out tests are still in test_datetime.py.
+ # self.assertEqual(t1.utcoffset(), -300)
+ # self.assertEqual(t2.utcoffset(), 0)
+ # self.assertEqual(t3.utcoffset(), 60)
+ # self.assertEqual(t1.tzname(), "EST")
+ # self.assertEqual(t2.tzname(), "UTC")
+ # self.assertEqual(t3.tzname(), "MET")
+ # self.assertEqual(hash(t1), hash(t2))
+ # self.assertEqual(hash(t1), hash(t3))
+ # self.assertEqual(hash(t2), hash(t3))
+ self.assertEqual(t1, t2)
+ self.assertEqual(t1, t3)
+ self.assertEqual(t2, t3)
+ self.assertEqual(str(t1), "07:47:00-05:00")
+ self.assertEqual(str(t2), "12:47:00+00:00")
+ self.assertEqual(str(t3), "13:47:00+01:00")
+ if TESTING_C:
+ d = '_datetime.'
+ else:
+ d = ''
+ self.assertEqual(repr(t1), d + "timetz(7, 47, tzinfo=est)")
+ self.assertEqual(repr(t2), d + "timetz(12, 47, tzinfo=utc)")
+ self.assertEqual(repr(t3), d + "timetz(13, 47, tzinfo=met)")
+ self.assertEqual(t1.isoformat(), "07:47:00-05:00")
+ self.assertEqual(t2.isoformat(), "12:47:00+00:00")
+ self.assertEqual(t3.isoformat(), "13:47:00+01:00")
+ # self.assertEqual(t1.strftime("%H:%M:%S %Z %z"), "07:47:00 EST -0500")
+ # self.assertEqual(t2.strftime("%H:%M:%S %Z %z"), "12:47:00 UTC +0000")
+ # self.assertEqual(t3.strftime("%H:%M:%S %Z %z"), "13:47:00 MET +0100")
+
+
def test_suite():
allsuites = [unittest.makeSuite(klass, 'test')
Index: test_datetime.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/datetime/test_datetime.py,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** test_datetime.py 11 Dec 2002 01:47:20 -0000 1.62
--- test_datetime.py 12 Dec 2002 01:57:00 -0000 1.63
***************
*** 41,47 ****
t2 = timetz(12, 47, tzinfo=utc)
t3 = timetz(13, 47, tzinfo=met)
! self.assertEqual(t1.tzinfo, est)
! self.assertEqual(t2.tzinfo, utc)
! self.assertEqual(t3.tzinfo, met)
self.assertEqual(t1.utcoffset(), -300)
self.assertEqual(t2.utcoffset(), 0)
--- 41,45 ----
t2 = timetz(12, 47, tzinfo=utc)
t3 = timetz(13, 47, tzinfo=met)
! # XXX Most of the tests here have moved into test_both.py.
self.assertEqual(t1.utcoffset(), -300)
self.assertEqual(t2.utcoffset(), 0)
***************
*** 53,68 ****
self.assertEqual(hash(t1), hash(t3))
self.assertEqual(hash(t2), hash(t3))
- self.assertEqual(t1, t2)
- self.assertEqual(t1, t3)
- self.assertEqual(t2, t3)
- self.assertEqual(str(t1), "07:47:00-05:00")
- self.assertEqual(str(t2), "12:47:00+00:00")
- self.assertEqual(str(t3), "13:47:00+01:00")
- self.assertEqual(repr(t1), "timetz(7, 47, tzinfo=est)")
- self.assertEqual(repr(t2), "timetz(12, 47, tzinfo=utc)")
- self.assertEqual(repr(t3), "timetz(13, 47, tzinfo=met)")
- self.assertEqual(t1.isoformat(), "07:47:00-05:00")
- self.assertEqual(t2.isoformat(), "12:47:00+00:00")
- self.assertEqual(t3.isoformat(), "13:47:00+01:00")
self.assertEqual(t1.strftime("%H:%M:%S %Z %z"), "07:47:00 EST -0500")
self.assertEqual(t2.strftime("%H:%M:%S %Z %z"), "12:47:00 UTC +0000")
--- 51,54 ----