[Python-checkins] python/nondist/sandbox/datetime obj_timetz.c,1.3,1.4

2002年12月11日 11:29:29 -0800

Update of /cvsroot/python/python/nondist/sandbox/datetime
In directory sc8-pr-cvs1:/tmp/cvs-serv21051
Modified Files:
	obj_timetz.c 
Log Message:
Moving timetz a teensy bit closer to usefulness.
Index: obj_timetz.c
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/datetime/obj_timetz.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** obj_timetz.c	11 Dec 2002 18:54:10 -0000	1.3
--- obj_timetz.c	11 Dec 2002 19:29:26 -0000	1.4
***************
*** 2,5 ****
--- 2,6 ----
 * XXX This is a copy and very light edit of obj_time.c.
 * XXX The tzinfo base clase has to get implemented first.
+ * XXX OK, that part got done. This is slowly becoming functional now.
 */
 /*
***************
*** 7,41 ****
 */
 
! /* Accessor properties. */
! 
! static PyObject *
! timetz_hour(PyDateTime_TimeTZ *self, void *unused)
! {
! 	return PyInt_FromLong(TIME_GET_HOUR(self));
! }
! 
! static PyObject *
! timetz_minute(PyDateTime_TimeTZ *self, void *unused)
! {
! 	return PyInt_FromLong(TIME_GET_MINUTE(self));
! }
! 
! static PyObject *
! timetz_second(PyDateTime_TimeTZ *self, void *unused)
! {
! 	return PyInt_FromLong(TIME_GET_SECOND(self));
! }
 
 static PyObject *
! timetz_microsecond(PyDateTime_TimeTZ *self, void *unused)
 {
! 	return PyInt_FromLong(TIME_GET_MICROSECOND(self));
 }
 
 static PyGetSetDef timetz_getset[] = {
! 	{"hour", (getter)timetz_hour},
! 	{"minute", (getter)timetz_minute},
! 	{"second", (getter)timetz_second},
! 	{"microsecond", (getter)timetz_microsecond},
 	{NULL}
 };
--- 8,24 ----
 */
 
! /* Accessor properties. Properties for hour, minute, second and microsecond
! * are inherited from time.
! */
 
 static PyObject *
! timetz_tzinfo(PyDateTime_TimeTZ *self, void *unused)
 {
! 	Py_INCREF(self->tzinfo);
! 	return self->tzinfo;
 }
 
 static PyGetSetDef timetz_getset[] = {
! 	{"tzinfo", (getter)timetz_tzinfo},
 	{NULL}
 };
***************
*** 286,290 ****
 	0,					/* ob_size */
 	/* XXX When this module is renamed to datetime, change tp_name. */
! 	"_datetime.time",			/* tp_name */
 	sizeof(PyDateTime_TimeTZ),		/* tp_basicsize */
 	0,					/* tp_itemsize */
--- 269,273 ----
 	0,					/* ob_size */
 	/* XXX When this module is renamed to datetime, change tp_name. */
! 	"_datetime.timetz",			/* tp_name */
 	sizeof(PyDateTime_TimeTZ),		/* tp_basicsize */
 	0,					/* tp_itemsize */
***************
*** 313,319 ****
 	0,					/* tp_iter */
 	0,					/* tp_iternext */
! 	time_methods,				/* tp_methods */
 	0,					/* tp_members */
! 	time_getset,				/* tp_getset */
 	&PyDateTime_TimeType,			/* tp_base */
 	0,					/* tp_dict */
--- 296,302 ----
 	0,					/* tp_iter */
 	0,					/* tp_iternext */
! 	timetz_methods,				/* tp_methods */
 	0,					/* tp_members */
! 	timetz_getset,				/* tp_getset */
 	&PyDateTime_TimeType,			/* tp_base */
 	0,					/* tp_dict */