[pywin32-checkins] pywin32/com/win32com/src PythonCOM.cpp, 1.52.2.5, 1.52.2.6 oleargs.cpp, 1.41.2.6, 1.41.2.7

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

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

Modified Files:
      Tag: py3k
	PythonCOM.cpp oleargs.cpp 
Log Message:
merge lots of changes from the trunk

Index: PythonCOM.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/src/PythonCOM.cpp,v
retrieving revision 1.52.2.5
retrieving revision 1.52.2.6
diff -C2 -d -r1.52.2.5 -r1.52.2.6
*** PythonCOM.cpp	8 Jan 2009 03:45:49 -0000	1.52.2.5
--- PythonCOM.cpp	14 Jan 2009 12:42:02 -0000	1.52.2.6
***************
*** 18,21 ****
--- 18,23 ----
  #include "PyComTypeObjects.h"
  #include "OleAcc.h" // for ObjectFromLresult proto...
+ #include "pyerrors.h" // for PyErr_Warn in 2.5 and earlier...
+ 
  
  extern int PyCom_RegisterCoreIIDs(PyObject *dict);
***************
*** 744,748 ****
  static PyObject *pythoncom_MakeIID(PyObject *self, PyObject *args)
  {
! 	PyErr_WarnEx(PyExc_PendingDeprecationWarning, "MakeIID is deprecated - please use pywintypes.IID() instead.", 1);
  	return PyWinMethod_NewIID(self, args);
  }
--- 746,750 ----
  static PyObject *pythoncom_MakeIID(PyObject *self, PyObject *args)
  {
! 	PyErr_Warn(PyExc_PendingDeprecationWarning, "MakeIID is deprecated - please use pywintypes.IID() instead.");
  	return PyWinMethod_NewIID(self, args);
  }
***************
*** 751,755 ****
  static PyObject *pythoncom_MakeTime(PyObject *self, PyObject *args)
  {
! 	PyErr_WarnEx(PyExc_PendingDeprecationWarning, "MakeTime is deprecated - please use pywintypes.Time() instead.", 1);
  	return PyWinMethod_NewTime(self, args);
  }
--- 753,757 ----
  static PyObject *pythoncom_MakeTime(PyObject *self, PyObject *args)
  {
! 	PyErr_Warn(PyExc_PendingDeprecationWarning, "MakeTime is deprecated - please use pywintypes.Time() instead.");
  	return PyWinMethod_NewTime(self, args);
  }

Index: oleargs.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/src/oleargs.cpp,v
retrieving revision 1.41.2.6
retrieving revision 1.41.2.7
diff -C2 -d -r1.41.2.6 -r1.41.2.7
*** oleargs.cpp	8 Jan 2009 03:45:49 -0000	1.41.2.6
--- oleargs.cpp	14 Jan 2009 12:42:02 -0000	1.41.2.7
***************
*** 108,113 ****
  		V_I4(var) = PyInt_AsLong(obj);
  	}
- 	// PyInstance_Check had disappeared in py3k
- 	// else if (PyInstance_Check(obj) && PyObject_HasAttrString(obj, "_oleobj_"))
  	else if (PyObject_HasAttrString(obj, "_oleobj_"))
  	{
--- 108,111 ----
***************
*** 625,629 ****
  				Py_DECREF(obSave);
  				if (obItemCheck==NULL) {
- 					// Py_XDECREF(obItemCheck);
  					delete [] pBounds;
  					return FALSE;
--- 623,626 ----