[pywin32-checkins] pywin32/com/win32com/src oleargs.cpp, 1.41.2.7, 1.41.2.8

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

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

Modified Files:
      Tag: py3k
	oleargs.cpp 
Log Message:
merge recent changes from the trunk

Index: oleargs.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32com/src/oleargs.cpp,v
retrieving revision 1.41.2.7
retrieving revision 1.41.2.8
diff -C2 -d -r1.41.2.7 -r1.41.2.8
*** oleargs.cpp	14 Jan 2009 12:42:02 -0000	1.41.2.7
--- oleargs.cpp	25 Jan 2009 04:52:20 -0000	1.41.2.8
***************
*** 48,52 ****
  	BOOL bGoodEmpty = FALSE; // Set if VT_EMPTY should really be used.
  	V_VT(var) = VT_EMPTY;
! 	if ( PyString_Check(obj) || PyUnicode_Check(obj) )
  	{
  		if ( !PyWinObject_AsBstr(obj, &V_BSTR(var)) ) {
--- 48,57 ----
  	BOOL bGoodEmpty = FALSE; // Set if VT_EMPTY should really be used.
  	V_VT(var) = VT_EMPTY;
! 	if (
! // In py3k we don't convert PyString_Check objects (ie, bytes) to BSTR...
! #if (PY_VERSION_HEX < 0x03000000)
! 	    PyString_Check(obj) ||
! #endif
! 	    PyUnicode_Check(obj) )
  	{
  		if ( !PyWinObject_AsBstr(obj, &V_BSTR(var)) ) {