mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 08:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Use the new Unicode API

Browse source 
* Replace PyUnicode_FromUnicode(NULL, 0) by PyUnicode_New(0, 0)
 * Replce PyUnicode_FromUnicode(str, len) by PyUnicode_FromWideChar(str, len)
 * Replace Py_UNICODE by wchar_t
 * posix_putenv() uses PyUnicode_FromFormat() to create the string, instead
   of PyUnicode_FromUnicode() + _snwprintf()
This commit is contained in:
Victor Stinner 2011-11-22 02:27:30 +01:00
parent b84d723509
commit 9d3b93ba30
10 changed files with 38 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

10
PC/_msi.c
View file

@ -18,7 +18,7 @@ static PyObject*
uuidcreate(PyObject* obj, PyObject*args)
{
UUID result;
unsigned short *cresult;
wchar_t *cresult;
PyObject *oresult;
/* May return ok, local only, and no address.
@ -35,7 +35,7 @@ uuidcreate(PyObject* obj, PyObject*args)
return NULL;
}
oresult = PyUnicode_FromUnicode(cresult, wcslen(cresult));
oresult = PyUnicode_FromWideChar(cresult, wcslen(cresult));
RpcStringFreeW(&cresult);
return oresult;
@ -379,7 +379,7 @@ record_getstring(msiobj* record, PyObject* args)
}
if (status != ERROR_SUCCESS)
return msierror((int) status);
string = PyUnicode_FromUnicode(res, size);
string = PyUnicode_FromWideChar(res, size);
if (buf != res)
free(res);
return string;
@ -401,7 +401,7 @@ record_setstring(msiobj* record, PyObject *args)
{
int status;
int field;
Py_UNICODE *data;
wchar_t *data;
if (!PyArg_ParseTuple(args, "iu:SetString", &field, &data))
return NULL;
@ -418,7 +418,7 @@ record_setstream(msiobj* record, PyObject *args)
{
int status;
int field;
Py_UNICODE *data;
wchar_t *data;
if (!PyArg_ParseTuple(args, "iu:SetStream", &field, &data))
return NULL;