[pywin32-checkins] pywin32/win32/src win32process.i, 1.33.2.1, 1.33.2.2

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

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

Modified Files:
      Tag: py3k
	win32process.i 
Log Message:
Use Python's PyUnicode_GET_SIZE() instead of our own private and
potentially confusing PyUnicode_Size function (soon to be removed from
a pywintypes near you!)


Index: win32process.i
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/win32process.i,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -C2 -d -r1.33.2.1 -r1.33.2.2
*** win32process.i	29 Aug 2008 04:59:27 -0000	1.33.2.1
--- win32process.i	1 Oct 2008 09:37:52 -0000	1.33.2.2
***************
*** 519,523 ****
  			} else if (PyUnicode_Check(key)) {
  				bIsUnicode = TRUE;
! 				bufLen += PyUnicode_Size(key) + 1;
  			} else {
  				PyErr_SetString(PyExc_TypeError, "dictionary must have keys and values as strings or unicode objects.");
--- 519,523 ----
  			} else if (PyUnicode_Check(key)) {
  				bIsUnicode = TRUE;
! 				bufLen += PyUnicode_GET_SIZE(key) + 1;
  			} else {
  				PyErr_SetString(PyExc_TypeError, "dictionary must have keys and values as strings or unicode objects.");
***************
*** 530,534 ****
  					goto done;
  				}
! 				bufLen += PyUnicode_Size(key) + 1;
  			}
  			else {
--- 530,534 ----
  					goto done;
  				}
! 				bufLen += PyUnicode_GET_SIZE(key) + 1;
  			}
  			else {
***************
*** 546,550 ****
  				goto done;
  			}
! 			bufLen += PyUnicode_Size(val) + 2; // For the '=' and '\0'
  		}
  		else {
--- 546,550 ----
  				goto done;
  			}
! 			bufLen += PyUnicode_GET_SIZE(val) + 2; // For the '=' and '\0'
  		}
  		else {