[Python-checkins] python/dist/src/Modules datetimemodule.c,1.36,1.37

[tim_one@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv26942/python/Modules

Modified Files:
	datetimemodule.c 
Log Message:
Got rid of the timetz type entirely.  This was a bit trickier than I
hoped it would be, but not too bad.  A test had to change:
time.__setstate__() can no longer add a non-None tzinfo member to a time
object that didn't already have one, since storage for a tzinfo member
doesn't exist in that case.


Index: datetimemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/datetimemodule.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** datetimemodule.c	10 Jan 2003 02:05:14 -0000	1.36
--- datetimemodule.c	10 Jan 2003 03:49:02 -0000	1.37
***************
*** 83,87 ****
  static PyTypeObject PyDateTime_TimeType;
  static PyTypeObject PyDateTime_TZInfoType;
- static PyTypeObject PyDateTime_TimeTZType;
  
  /* ---------------------------------------------------------------------------
--- 83,86 ----
***************
*** 608,613 ****
  	if (PyDateTimeTZ_Check(self))
  		tzinfo = ((PyDateTime_DateTimeTZ *)self)->tzinfo;
[...1425 lines suppressed...]
  	Py_DECREF(x);
  
! 	x = new_time(23, 59, 59, 999999, Py_None);
  	if (x == NULL || PyDict_SetItemString(d, "max", x) < 0)
  		return;
***************
*** 5212,5217 ****
  	PyModule_AddObject(m, "tzinfo", (PyObject *) &PyDateTime_TZInfoType);
  
! 	Py_INCREF(&PyDateTime_TimeTZType);
! 	PyModule_AddObject(m, "time", (PyObject *) &PyDateTime_TimeTZType);
  
  	Py_INCREF(&PyDateTime_DateTimeTZType);
--- 5072,5077 ----
  	PyModule_AddObject(m, "tzinfo", (PyObject *) &PyDateTime_TZInfoType);
  
! 	Py_INCREF(&PyDateTime_TimeType);
! 	PyModule_AddObject(m, "time", (PyObject *) &PyDateTime_TimeType);
  
  	Py_INCREF(&PyDateTime_DateTimeTZType);