Skip to content

bpo-36346: array: Don't use deprecated APIs #19653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 11, 2020
Merged

bpo-36346: array: Don't use deprecated APIs #19653

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
240e7e5
bpo-36346: array: Don't use deprecated APIs
methane Apr 22, 2020
1d9569a
update doc
methane Apr 23, 2020
c075693
Add what's new entry
methane Apr 27, 2020
3cf0028
Apply suggestions from code review
methane Apr 30, 2020
fbc3925
Update doc
methane Apr 30, 2020
bea1779
Don't use deprecated "u#" format.
methane Apr 30, 2020
df0ea67
more assert
methane May 1, 2020
8454e8c
remove redundant NULL check
methane May 1, 2020
4ddac33
remove redundant assert
methane May 1, 2020
21b49a4
Merge branch 'master' into array-wchar
methane May 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Don't use deprecated "u#" format.
  • Loading branch information
@methane
methane committed Apr 30, 2020
commit bea1779557ae3fb1f72be6762a91c3bca7156f2c
21 changes: 14 additions & 7 deletions Modules/arraymodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,18 +241,25 @@ u_getitem(arrayobject *ap, Py_ssize_t i)
static int
u_setitem(arrayobject *ap, Py_ssize_t i, PyObject *v)
{
wchar_t *p;
Py_ssize_t len;

if (!PyArg_Parse(v, "u#;array item must be unicode character", &p, &len))
PyObject *u;
if (!PyArg_Parse(v, "U;array item must be unicode character", &u)) {
return -1;
if (len != 1) {
}

Py_ssize_t len = PyUnicode_AsWideChar(u, NULL, 0);
if (len != 2) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On Windows with 16-bit wchar_t, characters larger than U+FFFF take two wchar_t, no? (A surrogate pair.) Maybe change the error message if this case happens?

PyErr_SetString(PyExc_TypeError,
"array item must be unicode character");
return -1;
}
if (i >= 0)
((wchar_t *)ap->ob_item)[i] = p[0];

wchar_t w;
len = PyUnicode_AsWideChar(u, &w, 1);
assert(len == 1);

if (i >= 0) {
((wchar_t *)ap->ob_item)[i] = w;
}
return 0;
}

Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy