diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2010-12-03 20:14:31 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2010-12-03 20:14:31 +0000 |
| commit | 4d0d471a8031de90a2b1ce99c4ac4780e60b3bc9 (patch) | |
| tree | c8f1fef715f8d158e58f17cab14af65455de1d77 /Objects/unicodeobject.c | |
| parent | c4df7845143f9afe0d20f4421a41904f3cbb991a (diff) | |
| download | cpython-git-4d0d471a8031de90a2b1ce99c4ac4780e60b3bc9.tar.gz | |
Merge branches/pep-0384.
Diffstat (limited to 'Objects/unicodeobject.c')
| -rw-r--r-- | Objects/unicodeobject.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index f66773e26a..d3a2d1b715 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -1263,7 +1263,7 @@ unicode_aswidechar(PyUnicodeObject *unicode, } Py_ssize_t -PyUnicode_AsWideChar(PyUnicodeObject *unicode, +PyUnicode_AsWideChar(PyObject *unicode, wchar_t *w, Py_ssize_t size) { @@ -1271,7 +1271,7 @@ PyUnicode_AsWideChar(PyUnicodeObject *unicode, PyErr_BadInternalCall(); return -1; } - return unicode_aswidechar(unicode, w, size); + return unicode_aswidechar((PyUnicodeObject*)unicode, w, size); } wchar_t* @@ -9222,7 +9222,7 @@ unicode_subscript(PyUnicodeObject* self, PyObject* item) Py_UNICODE* result_buf; PyObject* result; - if (PySlice_GetIndicesEx((PySliceObject*)item, PyUnicode_GET_SIZE(self), + if (PySlice_GetIndicesEx(item, PyUnicode_GET_SIZE(self), &start, &stop, &step, &slicelength) < 0) { return NULL; } |