jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refine Python 2 unicode strings patch

Browse source
This commit is contained in:
William S Fulton 2015-12-19 03:46:44 +00:00
commit 291186cfaf
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Lib/python/pystrings.swg
View file

@ -63,22 +63,28 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
%#endif %#endif
return SWIG_OK; return SWIG_OK;
} else { } else {
%#if defined(SWIG_PYTHON_2_UNICODE)
%#if PY_VERSION_HEX<0x03000000 %#if PY_VERSION_HEX<0x03000000
if (PyUnicode_Check(obj)) { if (PyUnicode_Check(obj)) {
char *cstr; Py_ssize_t len; char *cstr; Py_ssize_t len;
obj = PyUnicode_AsUTF8String(obj); if (!alloc && cptr) {
if (PyString_AsStringAndSize(obj, &cstr, &len) == -1) { return SWIG_RuntimeError;
Py_XDECREF(obj);
return SWIG_TypeError;
} }
obj = PyUnicode_AsUTF8String(obj);
if (PyString_AsStringAndSize(obj, &cstr, &len) != -1) {
if (cptr) {
if (alloc) *alloc = SWIG_NEWOBJ;
*cptr = %new_copy_array(cstr, len + 1, char);
}
if (psize) *psize = len + 1;
if (alloc) *alloc = SWIG_NEWOBJ; Py_XDECREF(obj);
if (psize) *psize = len + 1; return SWIG_OK;
*cptr = %new_copy_array(cstr, len + 1, char); } else {
Py_XDECREF(obj);
Py_XDECREF(obj); }
return SWIG_OK;
} }
%#endif
%#endif %#endif
swig_type_info* pchar_descriptor = SWIG_pchar_descriptor(); swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
@ -122,4 +128,3 @@ SWIG_FromCharPtrAndSize(const char* carray, size_t size)
} }
} }