[pywin32-checkins] pywin32/win32/src PyTime.cpp, 1.19.2.5, 1.19.2.6 win32apimodule.cpp, 1.89.2.6, 1.89.2.7 win32inet_winhttp.cpp, 1.2.2.1, 1.2.2.2

[Mark H. <mha...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4331/win32/src

Modified Files:
      Tag: py3k
	PyTime.cpp win32apimodule.cpp win32inet_winhttp.cpp 
Log Message:
merge various trunk changes

Index: win32apimodule.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32apimodule.cpp,v
retrieving revision 1.89.2.6
retrieving revision 1.89.2.7
diff -C2 -d -r1.89.2.6 -r1.89.2.7
*** win32apimodule.cpp	27 Jan 2009 07:56:45 -0000	1.89.2.6
--- win32apimodule.cpp	28 Jan 2009 11:29:52 -0000	1.89.2.7
***************
*** 2433,2437 ****
  {
  	// @pyparm tuple|tzi||A tuple with the timezone info
! 	// @desc The tuple is of form.
  	TIME_ZONE_INFORMATION tzi;
  	PyObject *obStdName, *obStdDate;
--- 2433,2437 ----
  {
  	// @pyparm tuple|tzi||A tuple with the timezone info
! 	// @comm The tuple is of form:
  	TIME_ZONE_INFORMATION tzi;
  	PyObject *obStdName, *obStdDate;
***************
*** 2439,2448 ****
  	if (!PyArg_ParseTuple (args, "(iOOiOOi):SetTimeZoneInformation",
  			       &tzi.Bias, // @tupleitem 0|int|Bias|
! 			       &obStdName, // @tupleitem 1|string|StandardName
! 			       &obStdDate, // @tupleitem 2|SYSTEMTIME tuple|StandardDate
! 			       &tzi.StandardBias, // @tupleitem 3|int|StandardBias
! 			       &obDaylightName, // @tupleitem 4|string|DaylightName
! 			       &obDaylightDate, // @tupleitem 5|SYSTEMTIME tuple|DaylightDate
! 			       &tzi.DaylightBias))// @tupleitem 6|int|DaylightBias
  		return NULL;
  	WCHAR *temp;
--- 2439,2448 ----
  	if (!PyArg_ParseTuple (args, "(iOOiOOi):SetTimeZoneInformation",
  			       &tzi.Bias, // @tupleitem 0|int|Bias|
! 			       &obStdName, // @tupleitem 1|string|StandardName|
! 			       &obStdDate, // @tupleitem 2|SYSTEMTIME tuple|StandardDate|
! 			       &tzi.StandardBias, // @tupleitem 3|int|StandardBias|
! 			       &obDaylightName, // @tupleitem 4|string|DaylightName|
! 			       &obDaylightDate, // @tupleitem 5|SYSTEMTIME tuple|DaylightDate|
! 			       &tzi.DaylightBias))// @tupleitem 6|int|DaylightBias|
  		return NULL;
  	WCHAR *temp;

Index: win32inet_winhttp.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32inet_winhttp.cpp,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** win32inet_winhttp.cpp	11 Dec 2008 04:13:35 -0000	1.2.2.1
--- win32inet_winhttp.cpp	28 Jan 2009 11:29:52 -0000	1.2.2.2
***************
*** 129,133 ****
                          i->dwAccessType, // @tupleitem 0|int|dwAccessType|
                          i->lpszProxy, // @tupleitem 2|string|lpszProxy|
!                         i->lpszProxyBypass); // @tupleitem 3|string|lpszProxy
      if (i->lpszProxy) GlobalFree(i->lpszProxy);
      if (i->lpszProxyBypass) GlobalFree(i->lpszProxyBypass);
--- 129,133 ----
                          i->dwAccessType, // @tupleitem 0|int|dwAccessType|
                          i->lpszProxy, // @tupleitem 2|string|lpszProxy|
!                         i->lpszProxyBypass); // @tupleitem 3|string|lpszProxy|
      if (i->lpszProxy) GlobalFree(i->lpszProxy);
      if (i->lpszProxyBypass) GlobalFree(i->lpszProxyBypass);

Index: PyTime.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/PyTime.cpp,v
retrieving revision 1.19.2.5
retrieving revision 1.19.2.6
diff -C2 -d -r1.19.2.5 -r1.19.2.6
*** PyTime.cpp	27 Jan 2009 07:56:45 -0000	1.19.2.5
--- PyTime.cpp	28 Jan 2009 11:29:52 -0000	1.19.2.6
***************
*** 683,695 ****
  ///////////////////////////////////////////////////////////////////////////
  #ifdef PYWIN_HAVE_DATETIME_CAPI
! // @object PyDateTime|A Python object, representing an instant in time.
! // @desc pywin32 builds for Python 3.0 use datetime objects instead of the
! // old PyTime object.
! // @desc PyDateTime is a sub-class of the regular datetime.datetime object.
! // It is subclassed so it can provide a somewhat backwards compatible
! // <om PyDateTime.Format> method, but is otherwise identical.
! 
! // @method str|PyDateTime|Format|
! // @desc This method is an alias for the datetime strftime method, using
  // %c as the default value for the format string.
  static PyObject *PyWinDateTimeType_Format(PyObject *self, PyObject *args)
--- 683,688 ----
  ///////////////////////////////////////////////////////////////////////////
  #ifdef PYWIN_HAVE_DATETIME_CAPI
! // @pymethod str|PyDateTime|Format|
! // @comm This method is an alias for the datetime strftime method, using
  // %c as the default value for the format string.
  static PyObject *PyWinDateTimeType_Format(PyObject *self, PyObject *args)
***************
*** 713,716 ****
--- 706,716 ----
  }
  
+ // @object PyDateTime|A Python object, representing an instant in time.
+ // @comm pywin32 builds for Python 3.0 use datetime objects instead of the
+ // old PyTime object.
+ // @comm PyDateTime is a sub-class of the regular datetime.datetime object.
+ // It is subclassed so it can provide a somewhat backwards compatible
+ // <om PyDateTime.Format> method, but is otherwise identical.
+ 
  struct PyMethodDef PyWinDateTimeType_methods[] = {
  	{"Format",     PyWinDateTimeType_Format, 1}, 	// @pymeth Format|Formats the time value - an alias for strftime with a default param.