[Python-checkins] python/nondist/sandbox/datetime obj_delta.c,1.3,1.4 test_both.py,1.2,1.3
tim_one@users.sourceforge.net
tim_one@users.sourceforge.net
Mon, 25 Nov 2002 19:23:12 -0800
Update of /cvsroot/python/python/nondist/sandbox/datetime
In directory sc8-pr-cvs1:/tmp/cvs-serv18625
Modified Files:
obj_delta.c test_both.py
Log Message:
Just lining stuff up.
Index: obj_delta.c
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/datetime/obj_delta.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** obj_delta.c 21 Nov 2002 19:24:53 -0000 1.3
--- obj_delta.c 26 Nov 2002 03:23:10 -0000 1.4
***************
*** 53,57 ****
diff = GET_TD_SECONDS(self) - GET_TD_SECONDS(other);
if (diff == 0)
! diff = GET_TD_MICROSECONDS(self) -
GET_TD_MICROSECONDS(other);
}
--- 53,57 ----
diff = GET_TD_SECONDS(self) - GET_TD_SECONDS(other);
if (diff == 0)
! diff = GET_TD_MICROSECONDS(self) -
GET_TD_MICROSECONDS(other);
}
***************
*** 191,196 ****
static PyNumberMethods delta_as_number = {
delta_add, /* nb_add */
! delta_subtract, /* nb_subtract */
! delta_multiply, /* nb_multiply */
0, /* nb_divide */
0, /* nb_remainder */
--- 191,196 ----
static PyNumberMethods delta_as_number = {
delta_add, /* nb_add */
! delta_subtract, /* nb_subtract */
! delta_multiply, /* nb_multiply */
0, /* nb_divide */
0, /* nb_remainder */
***************
*** 200,204 ****
0, /* nb_positive */
0, /* nb_absolute */
! (inquiry)delta_nonzero, /* nb_nonzero */
};
--- 200,204 ----
0, /* nb_positive */
0, /* nb_absolute */
! (inquiry)delta_nonzero, /* nb_nonzero */
};
***************
*** 206,210 ****
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
! "timedelta", /* tp_name */
sizeof(PyDateTime_Delta), /* tp_basicsize */
0, /* tp_itemsize */
--- 206,210 ----
PyObject_HEAD_INIT(NULL)
0, /* ob_size */
! "timedelta", /* tp_name */
sizeof(PyDateTime_Delta), /* tp_basicsize */
0, /* tp_itemsize */
***************
*** 213,222 ****
0, /* tp_getattr */
0, /* tp_setattr */
! (cmpfunc)delta_compare, /* tp_compare */
! (reprfunc)delta_repr, /* tp_repr */
&delta_as_number, /* tp_as_number */
0, /* tp_as_sequence */
0, /* tp_as_mapping */
! (hashfunc)delta_hash, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
--- 213,222 ----
0, /* tp_getattr */
0, /* tp_setattr */
! (cmpfunc)delta_compare, /* tp_compare */
! (reprfunc)delta_repr, /* tp_repr */
&delta_as_number, /* tp_as_number */
0, /* tp_as_sequence */
0, /* tp_as_mapping */
! (hashfunc)delta_hash, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
***************
*** 233,237 ****
0, /* tp_iternext */
0, /* tp_methods */
! delta_members, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
--- 233,237 ----
0, /* tp_iternext */
0, /* tp_methods */
! delta_members, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
***************
*** 243,246 ****
0, /* tp_alloc */
delta_new, /* tp_new */
! _PyObject_Del, /* tp_free */
};
--- 243,246 ----
0, /* tp_alloc */
delta_new, /* tp_new */
! _PyObject_Del, /* tp_free */
};
Index: test_both.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/datetime/test_both.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_both.py 26 Nov 2002 03:14:10 -0000 1.2
--- test_both.py 26 Nov 2002 03:23:10 -0000 1.3
***************
*** 35,40 ****
#############################################################################
! # date tests
class TestDate(unittest.TestCase):
--- 35,105 ----
#############################################################################
! # timedelta tests
!
! class TestTimeDelta(unittest.TestCase):
!
! def test_timedelta(self):
! a = timedelta(7) # One week
! b = timedelta(0, 60) # One minute
! c = timedelta(0, 0, 1000) # One millisecond
! self.assertEqual(a+b+c, timedelta(7, 60, 1000))
! self.assertEqual(a-b, timedelta(6, 24*3600 - 60))
! self.assertEqual(-a, timedelta(-7))
! self.assertEqual(+a, timedelta(7))
! self.assertEqual(-b, timedelta(-1, 24*3600 - 60))
! self.assertEqual(-c, timedelta(-1, 24*3600 - 1, 999000))
! self.assertEqual(abs(a), a)
! self.assertEqual(abs(-a), a)
! self.assertEqual(timedelta(6, 24*3600), a)
! self.assertEqual(timedelta(0, 0, 60*1000000), b)
! self.assertEqual(a*10, timedelta(70))
! self.assertEqual(a*10, 10*a)
! self.assertEqual(a*10L, 10*a)
! self.assertEqual(b*10, timedelta(0, 600))
! self.assertEqual(10*b, timedelta(0, 600))
! self.assertEqual(b*10L, timedelta(0, 600))
! self.assertEqual(c*10, timedelta(0, 0, 10000))
! self.assertEqual(10*c, timedelta(0, 0, 10000))
! self.assertEqual(c*10L, timedelta(0, 0, 10000))
! self.assertEqual(a*-1, -a)
! self.assertEqual(b*-2, -b-b)
! self.assertEqual(c*-2, -c+-c)
! self.assertEqual(b*(60*24), (b*60)*24)
! self.assertEqual(b*(60*24), (60*b)*24)
! self.assertEqual(c*1000, timedelta(0, 1))
! self.assertEqual(1000*c, timedelta(0, 1))
! self.assertEqual(a//7, timedelta(1))
! self.assertEqual(b//10, timedelta(0, 6))
! self.assertEqual(c//1000, timedelta(0, 0, 1))
! self.assertEqual(a//10, timedelta(0, 7*24*360))
! self.assertEqual(a//3600000, timedelta(0, 0, 7*24*1000))
! # Add/sub ints, longs, floats should be illegal
! for i in 1, 1L, 1.0:
! self.assertRaises(TypeError, lambda: a+i)
! self.assertRaises(TypeError, lambda: a-i)
! self.assertRaises(TypeError, lambda: i+a)
! self.assertRaises(TypeError, lambda: i-a)
! # Check keyword args to constructor
! eq = self.assertEqual
! td = timedelta
! eq(td(1), td(days=1))
! eq(td(0, 1), td(seconds=1))
! eq(td(0, 0, 1), td(microseconds=1))
! eq(td(weeks=1), td(days=7))
! eq(td(days=1), td(hours=24))
! eq(td(hours=1), td(minutes=60))
! eq(td(minutes=1), td(seconds=60))
! eq(td(seconds=1), td(milliseconds=1000))
! eq(td(milliseconds=1), td(microseconds=1000))
! # Check float args to constructor
! eq(td(weeks=1.0/7), td(days=1))
! eq(td(days=1.0/24), td(hours=1))
! eq(td(hours=1.0/60), td(minutes=1))
! eq(td(minutes=1.0/60), td(seconds=1))
! eq(td(seconds=0.001), td(milliseconds=1))
! eq(td(milliseconds=0.001), td(microseconds=1))
+ #############################################################################
+ # date tests
class TestDate(unittest.TestCase):
***************
*** 291,296 ****
def test_suite():
! s1 = unittest.makeSuite(TestDate, 'test')
! return unittest.TestSuite([s1])
def test_main():
--- 356,362 ----
def test_suite():
! s1 = unittest.makeSuite(TestTimeDelta, 'test')
! s2 = unittest.makeSuite(TestDate, 'test')
! return unittest.TestSuite([s1, s2])
def test_main():