[Python-checkins] python/nondist/sandbox/datetime obj_date.c,1.50,1.51

[tim_one@users.sourceforge.net]

Update of /cvsroot/python/python/nondist/sandbox/datetime
In directory sc8-pr-cvs1:/tmp/cvs-serv3757

Modified Files:
	obj_date.c 
Log Message:
Use typecheck macros.


Index: obj_date.c
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/datetime/obj_date.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** obj_date.c	13 Dec 2002 16:43:15 -0000	1.50
--- obj_date.c	13 Dec 2002 19:07:25 -0000	1.51
***************
*** 161,175 ****
  date_add(PyObject *left, PyObject *right)
  {
! 	PyTypeObject *left_type = left->ob_type;
! 	PyTypeObject *right_type = right->ob_type;
! 
! 	if (PyType_IsSubtype(left_type, &PyDateTime_DateTimeType)
! 	    || PyType_IsSubtype(right_type, &PyDateTime_DateTimeType)) {
  		Py_INCREF(Py_NotImplemented);
  		return Py_NotImplemented;
  	}
! 	if (PyType_IsSubtype(left_type, &PyDateTime_DateType)) {
  		/* date + ??? */
! 		if (PyType_IsSubtype(right_type, &PyDateTime_DeltaType))
  			/* date + delta */
  			return add_date_timedelta((PyDateTime_Date *) left,
--- 161,171 ----
  date_add(PyObject *left, PyObject *right)
  {
! 	if (PyDateTime_Check(left) || PyDateTime_Check(right)) {
  		Py_INCREF(Py_NotImplemented);
  		return Py_NotImplemented;
  	}
! 	if (PyDate_CheckExact(left)) {
  		/* date + ??? */
! 		if (PyDelta_Check(right))
  			/* date + delta */
  			return add_date_timedelta((PyDateTime_Date *) left,
***************
*** 181,185 ****
  		 * 'right' must be one of us, or we wouldn't have been called
  		 */
! 		if (PyType_IsSubtype(left_type, &PyDateTime_DeltaType))
  			/* delta + date */
  			return add_date_timedelta((PyDateTime_Date *) right,
--- 177,181 ----
  		 * 'right' must be one of us, or we wouldn't have been called
  		 */
! 		if (PyDelta_Check(left))
  			/* delta + date */
  			return add_date_timedelta((PyDateTime_Date *) right,