[Python-checkins] python/dist/src/Modules datetimemodule.c,1.39,1.40

2003年1月10日 19:39:13 -0800

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv21453/python/Modules
Modified Files:
	datetimemodule.c 
Log Message:
Got rid of the internal datetimetz type.
Index: datetimemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/datetimemodule.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** datetimemodule.c	11 Jan 2003 00:15:54 -0000	1.39
--- datetimemodule.c	11 Jan 2003 03:39:11 -0000	1.40
***************
*** 84,88 ****
 static PyTypeObject PyDateTime_DateType;
 static PyTypeObject PyDateTime_DateTimeType;
- static PyTypeObject PyDateTime_DateTimeTZType;
 static PyTypeObject PyDateTime_DeltaType;
 static PyTypeObject PyDateTime_TimeType;
--- 84,87 ----
***************
*** 610,615 ****
 	PyObject *tzinfo = NULL;

[...2541 lines suppressed...]
 5. (x+k).n = x.n + k
--- 4772,4776 ----

 4. (x+k).s = x.s
! This follows from #2, and that datimetime+timedelta preserves tzinfo.

 5. (x+k).n = x.n + k
***************
*** 5150,5154 ****
 None when called).

! The function wants to return a datetimetz y with timezone tz, equivalent to x.

 By #3, we want
--- 4781,4785 ----
 None when called).

! The function wants to return a datetime y with timezone tz, equivalent to x.

 By #3, we want