Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[3.12] gh-116326: Handler errors correctly in getwindowsversion in sysmodule (GH-116339) #116354

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 3 commits into from
Mar 5, 2024
Merged

[3.12] gh-116326: Handler errors correctly in getwindowsversion in sysmodule (GH-116339) #116354

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a44fb2
gh-116326: Handler errors correctly in `getwindowsversion` in `sysmod…
sobolevn Mar 5, 2024
021b0d4
Change `PyObject_GetOptionalAttrString` to exc check
sobolevn Mar 5, 2024
736a2e8
Make diff smaller
sobolevn Mar 5, 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
Change PyObject_GetOptionalAttrString to exc check
  • Loading branch information
@sobolevn
sobolevn committed Mar 5, 2024
commit 021b0d4b9c541b01e51a8acf08b1a6e55c245e40
10 changes: 7 additions & 3 deletions 10 Python/sysmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1584,12 +1584,16 @@ sys_getwindowsversion_impl(PyObject *module)
int pos = 0;
OSVERSIONINFOEXW ver;

if (PyObject_GetOptionalAttrString(module, "_cached_windows_version", &version) < 0) {
return NULL;
};
version = PyObject_GetAttrString(module, "_cached_windows_version");
if (version && PyObject_TypeCheck(version, &WindowsVersionType)) {
return version;
}
if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
PyErr_Clear();
}
else {
return NULL;
}
Py_XDECREF(version);

ver.dwOSVersionInfoSize = sizeof(ver);
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.