Skip to content

[pull] main from python:main #1502

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
pull merged 2 commits into from
Sep 20, 2026
Merged

[pull] main from python:main #1502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de0d976
gh-153319: Read turtledemo scripts with the source file's own encodin…
tonghuaroot Sep 20, 2026
41d0922
gh-157840: Special-case member descriptors when using `hasattr` (GH-1…
ZeroIntensity Sep 20, 2026
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
2 changes: 1 addition & 1 deletion Lib/turtledemo/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ def loadfile(self, filename):
modname = 'turtledemo.' + filename
__import__(modname)
self.module = sys.modules[modname]
with open(self.module.__file__, 'r') as f:
with open(self.module.__file__, encoding='utf-8') as f:
chars = f.read()
self.text.delete("1.0", "end")
self.text.insert("1.0", chars)
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core_and_Builtins/2026-09-20-12-11-01.gh-issue-157840.EAo1Kp.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Speed up calls to :func:`hasattr` and three-argument :func:`getattr` for
unassigned attributes in an object's :attr:`~object.__slots__` by roughly 6x.
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2026-07-08-19-40-00.gh-issue-153319.Qk7bE2.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
The :mod:`turtledemo` viewer now reads each demo script as UTF-8 instead of
the locale encoding.
13 changes: 13 additions & 0 deletions Objects/object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1924,6 +1924,19 @@ _PyObject_GenericGetAttrWithDict(PyObject *obj, PyObject *name,
if (descr != NULL) {
f = Py_TYPE(descr)->tp_descr_get;
if (f != NULL && PyDescr_IsData(descr)) {
// gh-157840: We special-case member descriptors here to avoid
// allocating an extra AttributeError
if (suppress && Py_IS_TYPE(descr, &PyMemberDescr_Type)) {
PyMemberDef *member = ((PyMemberDescrObject *)descr)->d_member;
if (member->type == Py_T_OBJECT_EX
&& !(member->flags & Py_AUDIT_READ)
&& PyObject_TypeCheck(obj, PyDescr_TYPE(descr))) {
PyObject **addr = _PyMember_GetOffset(obj, member);
if (FT_ATOMIC_LOAD_PTR(*addr) == NULL) {
goto done;
}
}
}
res = f(descr, obj, (PyObject *)Py_TYPE(obj));
if (res == NULL && suppress &&
PyErr_ExceptionMatches(PyExc_AttributeError)) {
Expand Down
Loading