Skip to content

bpo-42658: Using LCMapStringEx in ntpath.normcase #32010

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
zooba merged 17 commits into from
Jun 6, 2022
Merged

bpo-42658: Using LCMapStringEx in ntpath.normcase #32010

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
060cd71
Add _winapi.LCMapStringEx
aisk Mar 20, 2022
6ecbc48
Using _winapi.LCMapStringEx in ntpath.normcase
aisk Mar 20, 2022
c1429b9
📜🤖 Added by blurb_it.
blurb-it[bot] Mar 20, 2022
81be381
Changes from review
aisk Mar 21, 2022
6108d20
Update for comments
aisk Mar 21, 2022
3b4a5cb
Update for review and fix tests
aisk Mar 22, 2022
ef66941
Update by review comment
aisk Mar 23, 2022
6c0366b
Update for review comments
aisk Mar 25, 2022
6c6f2e2
fix news
aisk Mar 25, 2022
15749b8
Remove constants which can not been used
aisk Mar 26, 2022
7b2c62c
Fix ntpath_tests on non Windows systems
aisk Mar 26, 2022
a89adc0
Update news
aisk Mar 31, 2022
4119cc2
Skip test on block leaks on windows
aisk Mar 31, 2022
8a63de2
Fix news
aisk Mar 31, 2022
6789cd9
Revert the test modify
aisk Apr 9, 2022
d430371
update news
aisk Jun 4, 2022
7e0dcf8
update clinic for _winapi
aisk Jun 4, 2022
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
Update for comments
  • Loading branch information
@aisk
aisk committed Jun 4, 2022
commit 6108d201387aaedae8eca9635fa6e7768d1dc3de
4 changes: 1 addition & 3 deletions Misc/NEWS.d/next/Windows/2022-03-20-15-47-35.bpo-42658.16eXtb.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
Using Windows function `LCMapStringEx` in `ntpath.normcase` instead of `str.lower` to deal with non ASCII characters.

The `LCMapStringEx` is added in `_winapi` module also.
Using Windows function `LCMapStringEx` in `ntpath.normcase` instead of `str.lower` to deal with non ASCII characters. The `LCMapStringEx` is added in `_winapi` module also.
25 changes: 6 additions & 19 deletions Modules/_winapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1526,28 +1526,15 @@ _winapi_LCMapStringEx_impl(PyObject *module, LPCWSTR locale, DWORD flags,
LPCWSTR src)
/*[clinic end generated code: output=cf4713d80e2b47c9 input=9fe26f95d5ab0001]*/
{
if (flags & LCMAP_SORTHANDLE) {
PyErr_SetString(PyExc_ValueError, "LCMAP_SORTHANDLE is not supported");
return NULL;
}
if (flags & LCMAP_HASH) {
PyErr_SetString(PyExc_ValueError, "LCMAP_HASH is not supported");
return NULL;
}
if (flags & LCMAP_BYTEREV) {
PyErr_SetString(PyExc_ValueError, "LCMAP_BYTEREV is not supported");
return NULL;
}
if (flags & LCMAP_SORTKEY) {
PyErr_SetString(PyExc_ValueError, "LCMAP_SORTKEY is not supported");
return NULL;
if (flags & (LCMAP_SORTHANDLE | LCMAP_HASH | LCMAP_BYTEREV |
LCMAP_SORTKEY)) {
return PyErr_Format(PyExc_ValueError, "unsupported flags");
}

int dest_size = LCMapStringEx(locale, flags, src, wcslen(src), NULL, 0,
NULL, NULL, 0);
if (dest_size == 0) {
PyErr_SetFromWindowsErr(0);
return NULL;
return PyErr_SetFromWindowsErr(0);
}

wchar_t* dest = PyMem_NEW(wchar_t, dest_size);
Comment thread
aisk marked this conversation as resolved.
Outdated
Expand All @@ -1558,9 +1545,9 @@ _winapi_LCMapStringEx_impl(PyObject *module, LPCWSTR locale, DWORD flags,
int nmapped = LCMapStringEx(locale, flags, src, wcslen(src), dest, dest_size,
NULL, NULL, 0);
if (nmapped == 0) {
PyErr_SetFromWindowsErr(0);
DWORD error = GetLastError();
PyMem_DEL(dest);
return NULL;
return PyErr_SetFromWindowsErr(error);
}

PyObject *ret = PyUnicode_FromWideChar(dest, dest_size);
Expand Down