Skip to content

[3.11] gh-87868: Sort and remove duplicates in getenvironment() (GH-102731) #113866

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 6 commits into from
Jan 11, 2024
Merged

[3.11] gh-87868: Sort and remove duplicates in getenvironment() (GH-102731) #113866

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
255872a
gh-87868: Sort and remove duplicates in getenvironment() (GH-102731)
aisk Jan 9, 2024
03022e4
gh-87868: Skip `test_one_environment_variable` in `test_subprocess` w…
aisk Jan 10, 2024
97438d6
Update _winapi.c
zooba Jan 11, 2024
3e66498
Update _winapi.c
zooba Jan 11, 2024
3f85fa9
Update _winapi.c
zooba Jan 11, 2024
15a3a52
Fix sortenvironmentkey
zooba Jan 11, 2024
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
Fix sortenvironmentkey
  • Loading branch information
@zooba
zooba committed Jan 11, 2024
commit 15a3a52fc30ac01989b31e6108801aea41ecb400
13 changes: 9 additions & 4 deletions Modules/_winapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@

#include "Python.h"
#include "pycore_moduleobject.h" // _PyModule_GetState()
#include "pycore_runtime.h" // _Py_ID
#include "structmember.h" // PyMemberDef


#define WINDOWS_LEAN_AND_MEAN
#include "windows.h"
#include <crtdbg.h>
#include "winreparse.h"

#include "pycore_runtime.h" // _Py_ID

#if defined(MS_WIN32) && !defined(MS_WIN64)
#define HANDLE_TO_PYNUM(handle) \
PyLong_FromUnsignedLong((unsigned long) handle)
Expand Down Expand Up @@ -785,8 +785,13 @@ gethandle(PyObject* obj, const char* name)
static PyObject *
sortenvironmentkey(PyObject *module, PyObject *item)
{
return _winapi_LCMapStringEx_impl(NULL, LOCALE_NAME_INVARIANT,
LCMAP_UPPERCASE, item);
PyObject *result = NULL;
PyObject *locale = PyUnicode_FromWideChar(LOCALE_NAME_INVARIANT, -1);
if (locale) {
result = _winapi_LCMapStringEx_impl(NULL, locale, LCMAP_UPPERCASE, item);
Py_DECREF(locale);
}
return result;
}

static PyMethodDef sortenvironmentkey_def = {
Expand Down