Skip to content

gh-87868: Sort and remove duplicates in getenvironment() #102731

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 63 commits into from
Jan 9, 2024
Merged

gh-87868: Sort and remove duplicates in getenvironment() #102731

Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
aed39b7
gh-87868: correctly sort and remove duplicates in getenvironment()
aisk Mar 14, 2023
4de761b
Merge branch 'main' into getenvironment
AlexWaygood Mar 15, 2023
04f7d59
check null in normalize_environment
aisk Mar 17, 2023
c43abb2
Update Modules/_winapi.c
aisk Aug 20, 2023
3f6319a
Update Modules/_winapi.c
aisk Aug 20, 2023
8ef3b9c
Update Lib/test/test_subprocess.py
aisk Aug 20, 2023
46491c5
Merge remote-tracking branch 'upstream/main' into getenvironment
aisk Aug 20, 2023
ca13205
Adapt latest changes from main branch
aisk Aug 20, 2023
f727004
Fix test case
aisk Aug 20, 2023
6b9e873
update for review comments
aisk Sep 3, 2023
dd53528
add win32 related env validation tests
aisk Sep 3, 2023
37fa2f2
fix memory leak
aisk Sep 4, 2023
fcd8b88
Merge branch 'main' into getenvironment
aisk Sep 6, 2023
96754a1
Merge branch 'main' into getenvironment
aisk Sep 8, 2023
47155b5
follow PEP7
aisk Sep 8, 2023
a204740
add error check
aisk Sep 8, 2023
8ca7b8e
fix test
aisk Sep 11, 2023
b620bdb
better cleanup in error path
aisk Sep 11, 2023
65c8483
fix a mem leak
aisk Sep 13, 2023
2d2fd4d
refactor error handling
aisk Sep 13, 2023
2096209
fix one off iteration and add test
aisk Sep 19, 2023
da55b3b
fix one env test on non windows platforms
aisk Sep 19, 2023
5b17740
Merge branch 'main' into getenvironment
aisk Sep 24, 2023
bf5a555
using vector call
aisk Sep 24, 2023
66fddbe
fix test on none windows platforms
aisk Sep 24, 2023
2b82368
fix typo in test
aisk Sep 24, 2023
5c581ea
fix test on linux
aisk Sep 25, 2023
6b5d1da
revert line end modify and align codes with pep7
aisk Oct 4, 2023
bcd8910
Update Modules/_winapi.c
aisk Jan 6, 2024
3423e13
Update Modules/_winapi.c
aisk Jan 6, 2024
03a4f7e
Update Modules/_winapi.c
aisk Jan 6, 2024
186d718
Update Modules/_winapi.c
aisk Jan 6, 2024
8b074df
Update Modules/_winapi.c
aisk Jan 6, 2024
b675260
Update Modules/_winapi.c
aisk Jan 6, 2024
fb93eb1
Update Modules/_winapi.c
aisk Jan 6, 2024
f9d97eb
Update Modules/_winapi.c
aisk Jan 6, 2024
6f3b7ce
Update Modules/_winapi.c
aisk Jan 6, 2024
b9b8d6e
Update Modules/_winapi.c
aisk Jan 6, 2024
5fd7ebf
Update Modules/_winapi.c
aisk Jan 6, 2024
f87970a
Update Modules/_winapi.c
aisk Jan 6, 2024
cbdfa84
Update Lib/test/test_subprocess.py
aisk Jan 6, 2024
8748103
only keep the last duplicated environment key
aisk Jan 6, 2024
4aff3b4
split the normalize_environment function into two
aisk Jan 6, 2024
67b8731
Update Lib/test/test_subprocess.py
aisk Jan 7, 2024
d02319e
remove the error check for PyList_GET_ITEM
aisk Jan 7, 2024
d1c794b
decref the vectorcall result
aisk Jan 7, 2024
1763421
split normalze_keys into sort_keys and dedup_keys
aisk Jan 7, 2024
dbbaf1b
Update Modules/_winapi.c
aisk Jan 7, 2024
176e90d
refactor sort_environment_keys to remove the goto error stuff
aisk Jan 8, 2024
d088083
refactor the dedup_environment_keys to get rid of the goto error stuff
aisk Jan 8, 2024
471c8b8
fix a memory leak in `normalize_environment`
aisk Jan 8, 2024
a2dab93
revert the commit that moves key validation codes to the original place
aisk Jan 8, 2024
6a2bbee
fixed a memory leak
aisk Jan 8, 2024
22548cc
Update Modules/_winapi.c
aisk Jan 9, 2024
63cf753
Update Modules/_winapi.c
aisk Jan 9, 2024
91d091d
using int as return value rather than bool
aisk Jan 9, 2024
b053e2a
get rid of the goto error in normalize_environment
aisk Jan 9, 2024
5dd6215
Update Misc/NEWS.d/next/Windows/2023-03-15-23-53-45.gh-issue-87868.4C…
aisk Jan 9, 2024
be49dae
Update Modules/_winapi.c
aisk Jan 9, 2024
0aff1e9
Update Modules/_winapi.c
aisk Jan 9, 2024
72fc36d
Update Modules/_winapi.c
aisk Jan 9, 2024
725baec
Update Modules/_winapi.c
aisk Jan 9, 2024
0a308be
Update Modules/_winapi.c
aisk Jan 9, 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
Next Next commit
Update Modules/_winapi.c 
Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
  • Loading branch information
@aisk @erlend-aasland
aisk and erlend-aasland authored Jan 9, 2024
commit 0aff1e99bbb1813bb621fe2ef1e50800541801d0
5 changes: 1 addition & 4 deletions Modules/_winapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,10 +782,7 @@ sortenvironmentkey(PyObject *module, PyObject *item)
}

static PyMethodDef sortenvironmentkey_def = {
"sortenvironmentkey",
_PyCFunction_CAST(sortenvironmentkey),
METH_O,
"",
"sortenvironmentkey", _PyCFunction_CAST(sortenvironmentkey), METH_O, "",
};

static int
Expand Down