[pywin32-checkins] pywin32/com/win32com/src oleargs.cpp,1.44,1.45
OLD project page for the Python extensions for Windows
Brought to you by:
mhammond
From: Mark H. <mha...@us...> - 2009-01-25 03:11:45
|
Update of /cvsroot/pywin32/pywin32/com/win32com/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31265/com/win32com/src Modified Files: oleargs.cpp Log Message: don't convert bytes objects on py3k to VT_BSTR Index: oleargs.cpp =================================================================== RCS file: /cvsroot/pywin32/pywin32/com/win32com/src/oleargs.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** oleargs.cpp 12 Jan 2009 05:41:40 -0000 1.44 --- oleargs.cpp 25 Jan 2009 03:11:40 -0000 1.45 *************** *** 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)) ) { |