From d3d6dee58d1f244f500e86cd5cb7a549d8b989b0b794b8da9a84bc30139612be Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 11 Apr 2025 08:15:51 +0000 Subject: [PATCH] - Update to 3.10.17: - gh-131809: Update bundled libexpat to 2.7.1 - gh-131261: Upgrade to libexpat 2.7.0 - gh-105704: When using urllib.parse.urlsplit() and urllib.parse.urlparse() host parsing would not reject domain names containing square brackets ([ and ]). Square brackets are only valid for IPv6 and IPvFuture hosts according to RFC 3986 Section 3.2.2 (bsc#1236705, CVE-2025-0938, gh#python/cpython#105704). - gh-121284: Fix bug in the folding of rfc2047 encoded-words when flattening an email message using a modern email policy. Previously when an encoded-word was too long for a line, it would be decoded, split across lines, and re-encoded. But commas and other special characters in the original text could be left unencoded and unquoted. This could theoretically be used to spoof header lines using a carefully constructed encoded-word if the resulting rendered email was transmitted or re-parsed. - gh-80222: Fix bug in the folding of quoted strings when flattening an email message using a modern email policy. Previously when a quoted string was folded so that it spanned more than one line, the surrounding quotes and internal escapes would be omitted. This could theoretically be used to spoof header lines using a carefully constructed quoted string if the resulting rendered email was transmitted or re-parsed. - gh-119511: Fix a potential denial of service in the imaplib module. When connecting to a malicious server, it could cause an arbitrary amount of memory to be allocated. On many systems this is harmless as unused virtual memory is only OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python310?expand=0&rev=171 --- CVE-2025-0938-sq-brackets-domain-names.patch | 127 --- Python-3.10.16.tar.xz | 3 - Python-3.10.16.tar.xz.sigstore | 1 - Python-3.10.17.tar.xz | 3 + Python-3.10.17.tar.xz.sigstore | 1 + fix_configure_rst.patch | 18 +- python310.changes | 46 + python310.spec | 6 +- sphinx-72.patch | 928 +++++++++++-------- sphinx-802.patch | 8 +- 10 files changed, 603 insertions(+), 538 deletions(-) delete mode 100644 CVE-2025-0938-sq-brackets-domain-names.patch delete mode 100644 Python-3.10.16.tar.xz delete mode 100644 Python-3.10.16.tar.xz.sigstore create mode 100644 Python-3.10.17.tar.xz create mode 100644 Python-3.10.17.tar.xz.sigstore diff --git a/CVE-2025-0938-sq-brackets-domain-names.patch b/CVE-2025-0938-sq-brackets-domain-names.patch deleted file mode 100644 index fc07748..0000000 --- a/CVE-2025-0938-sq-brackets-domain-names.patch +++ /dev/null @@ -1,127 +0,0 @@ -From d91e2c740890837edafaee24d68112b776cda9c5 Mon Sep 17 00:00:00 2001 -From: Seth Michael Larson -Date: Fri, 31 Jan 2025 11:41:34 -0600 -Subject: [PATCH] gh-105704: Disallow square brackets (`[` and `]`) in domain - names for parsed URLs (GH-129418) - -* gh-105704: Disallow square brackets ( and ) in domain names for parsed URLs - -* Use Sphinx references - -Co-authored-by: Peter Bierma - -* Add mismatched bracket test cases, fix news format - -* Add more test coverage for ports - ---------- - -(cherry picked from commit d89a5f6a6e65511a5f6e0618c4c30a7aa5aba56a) - -Co-authored-by: Seth Michael Larson -Co-authored-by: Peter Bierma ---- - Lib/test/test_urlparse.py | 37 +++++++++- - Lib/urllib/parse.py | 20 ++++- - Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst | 4 + - 3 files changed, 58 insertions(+), 3 deletions(-) - create mode 100644 Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst - ---- a/Lib/test/test_urlparse.py -+++ b/Lib/test/test_urlparse.py -@@ -1149,16 +1149,51 @@ class UrlParseTestCase(unittest.TestCase - self.assertRaises(ValueError, urllib.parse.urlsplit, 'Scheme://user@[0439:23af::2309::fae7:1234]/Path?Query') - self.assertRaises(ValueError, urllib.parse.urlsplit, 'Scheme://user@[0439:23af:2309::fae7:1234:2342:438e:192.0.2.146]/Path?Query') - self.assertRaises(ValueError, urllib.parse.urlsplit, 'Scheme://user@]v6a.ip[/Path') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[v6a.ip]') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip].suffix') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[v6a.ip]/') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip].suffix/') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[v6a.ip]?') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip].suffix?') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]/') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix/') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]?') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix?') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:a') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix:a') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:a1') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix:a1') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:1a') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix:1a') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[::1].suffix:/') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[::1]:?') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@prefix.[v6a.ip]') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://user@[v6a.ip].suffix') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://[v6a.ip') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip]') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://]v6a.ip[') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://]v6a.ip') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip[') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix.[v6a.ip') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip].suffix') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix]v6a.ip[suffix') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://prefix]v6a.ip') -+ self.assertRaises(ValueError, urllib.parse.urlsplit, 'scheme://v6a.ip[suffix') - - def test_splitting_bracketed_hosts(self): -- p1 = urllib.parse.urlsplit('scheme://user@[v6a.ip]/path?query') -+ p1 = urllib.parse.urlsplit('scheme://user@[v6a.ip]:1234/path?query') - self.assertEqual(p1.hostname, 'v6a.ip') - self.assertEqual(p1.username, 'user') - self.assertEqual(p1.path, '/path') -+ self.assertEqual(p1.port, 1234) - p2 = urllib.parse.urlsplit('scheme://user@[0439:23af:2309::fae7%test]/path?query') - self.assertEqual(p2.hostname, '0439:23af:2309::fae7%test') - self.assertEqual(p2.username, 'user') - self.assertEqual(p2.path, '/path') -+ self.assertIs(p2.port, None) - p3 = urllib.parse.urlsplit('scheme://user@[0439:23af:2309::fae7:1234:192.0.2.146%test]/path?query') - self.assertEqual(p3.hostname, '0439:23af:2309::fae7:1234:192.0.2.146%test') - self.assertEqual(p3.username, 'user') ---- a/Lib/urllib/parse.py -+++ b/Lib/urllib/parse.py -@@ -442,6 +442,23 @@ def _checknetloc(netloc): - raise ValueError("netloc '" + netloc + "' contains invalid " + - "characters under NFKC normalization") - -+def _check_bracketed_netloc(netloc): -+ # Note that this function must mirror the splitting -+ # done in NetlocResultMixins._hostinfo(). -+ hostname_and_port = netloc.rpartition('@')[2] -+ before_bracket, have_open_br, bracketed = hostname_and_port.partition('[') -+ if have_open_br: -+ # No data is allowed before a bracket. -+ if before_bracket: -+ raise ValueError("Invalid IPv6 URL") -+ hostname, _, port = bracketed.partition(']') -+ # No data is allowed after the bracket but before the port delimiter. -+ if port and not port.startswith(":"): -+ raise ValueError("Invalid IPv6 URL") -+ else: -+ hostname, _, port = hostname_and_port.partition(':') -+ _check_bracketed_host(hostname) -+ - # Valid bracketed hosts are defined in - # https://www.rfc-editor.org/rfc/rfc3986#page-49 and https://url.spec.whatwg.org/ - def _check_bracketed_host(hostname): -@@ -505,8 +522,7 @@ def urlsplit(url, scheme='', allow_fragm - (']' in netloc and '[' not in netloc)): - raise ValueError("Invalid IPv6 URL") - if '[' in netloc and ']' in netloc: -- bracketed_host = netloc.partition('[')[2].partition(']')[0] -- _check_bracketed_host(bracketed_host) -+ _check_bracketed_netloc(netloc) - if allow_fragments and '#' in url: - url, fragment = url.split('#', 1) - if '?' in url: ---- /dev/null -+++ b/Misc/NEWS.d/next/Security/2025-01-28-14-08-03.gh-issue-105704.EnhHxu.rst -@@ -0,0 +1,4 @@ -+When using :func:`urllib.parse.urlsplit` and :func:`urllib.parse.urlparse` host -+parsing would not reject domain names containing square brackets (``[`` and -+``]``). Square brackets are only valid for IPv6 and IPvFuture hosts according to -+`RFC 3986 Section 3.2.2 `__. diff --git a/Python-3.10.16.tar.xz b/Python-3.10.16.tar.xz deleted file mode 100644 index 46fb1eb..0000000 --- a/Python-3.10.16.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bfb249609990220491a1b92850a07135ed0831e41738cf681d63cf01b2a8fbd1 -size 19610392 diff --git a/Python-3.10.16.tar.xz.sigstore b/Python-3.10.16.tar.xz.sigstore deleted file mode 100644 index b0fe16f..0000000 --- a/Python-3.10.16.tar.xz.sigstore +++ /dev/null @@ -1 +0,0 @@ -{"mediaType": "application/vnd.dev.sigstore.bundle.v0.3+json", "verificationMaterial": {"certificate": {"rawBytes": "MIICzDCCAlKgAwIBAgIUH4wr+RBSLHxmoLeVWQFWtLrOickwCgYIKoZIzj0EAwMwNzEVMBMGA1UEChMMc2lnc3RvcmUuZGV2MR4wHAYDVQQDExVzaWdzdG9yZS1pbnRlcm1lZGlhdGUwHhcNMjQxMjAzMTgzMzQ0WhcNMjQxMjAzMTg0MzQ0WjAAMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEDu7neWfjmWCoWs4toOwMe5ZS5m/Qod/IAYGdai04Qjx+fJ2JKIML8OXa376wmCRg+1mE5N75M5g55sjeH6AW5KOCAXEwggFtMA4GA1UdDwEB/wQEAwIHgDATBgNVHSUEDDAKBggrBgEFBQcDAzAdBgNVHQ4EFgQUVxcoODLOP6ce+ffWUlBZ8dQpAtAwHwYDVR0jBBgwFoAU39Ppz1YkEZb5qNjpKFWixi4YZD8wIgYDVR0RAQH/BBgwFoEUcGFibG9nc2FsQHB5dGhvbi5vcmcwKQYKKwYBBAGDvzABAQQbaHR0cHM6Ly9hY2NvdW50cy5nb29nbGUuY29tMCsGCisGAQQBg78wAQgEHQwbaHR0cHM6Ly9hY2NvdW50cy5nb29nbGUuY29tMIGJBgorBgEEAdZ5AgQCBHsEeQB3AHUA3T0wasbHETJjGR4cmWc3AqJKXrjePK3/h4pygC8p7o4AAAGTjcy6WQAABAMARjBEAiAWKkpOltF6fngTPFPiPrjo6Mnx7DvjTjhy+I9C8a1E8AIgDFHJXkaNO/cRHZCEycDJfdcJrMlDEI+iTAc9GbhJreMwCgYIKoZIzj0EAwMDaAAwZQIwRlcLZ+KTrMXkSOqoeZkRtIMzrMhiRvjoMfcYt7d3zX+t+fDtaywsYIu0WSWNtwLuAjEAk1LM0s1c13zn/l9B9I8YMDJxCiUY2ed5AK523TIy75cmH+IYO7XODOD86YSkytvS"}, "tlogEntries": [{"logIndex": "153123526", "logId": {"keyId": "wNI9atQGlz+VWfO6LRygH4QUfY/8W4RFwiT5i5WRgB0="}, "kindVersion": {"kind": "hashedrekord", "version": "0.0.1"}, "integratedTime": "1733250825", "inclusionPromise": {"signedEntryTimestamp": "MEUCIBb+3OGEfIJgweBH+795X/kmenmW5L6lzTaW5mU9DN++AiEAni2MKnETeAsGhc8u0W/Y5AuhYKd14TdRvoUw/bWhzjs="}, "inclusionProof": {"logIndex": "31219264", "rootHash": "EEDRbQekcBvIu2A3f37wAtzpj3Tu+lPYLi9AUyS4FBY=", "treeSize": "31219265", "hashes": ["jy1RZw1zMvGOhV5pYK21mUnw/3hfyXoogDNhzfMT8uA=", "t7CZ1TCAQBidKeIL1f3M7Y3VwBYB2DQeG1Sp8X8Mepc=", "LIvgEWJ5UP1rLp6WPJ2TzjrHAa5MpLpXOdj/yoZvLcM=", "XjayhjKU3shP7q7lhmhKDv3Vpi4gJgAPCu0KlEzc9Qo=", "go1dmexQYS5etu69upRRX7IFvuA0rIcT9aYjMstmPIU=", "AYwr74Bm2w383UnS7DdbZUUAhusq28JoxKpWrQ7OvGQ=", "u+yWmGIR6sAH32wiSy22mz1Yf+jfPdBTjFbyRISuTZw=", "3eFC7Gp4fWecybDOAw9uUTrM1xB7YRYRAGsfYkiQbV8=", "1uKk2qjOliHMiTk906jrchP8mXWsRG8apaU1sa0lfh0=", "oOecFfN3YqDOkbijS/ej1WF5Da/Gt/AZNhbwE9uoOE8=", "4lUF0YOu9XkIDXKXA0wMSzd6VeDY3TZAgmoOeWmS2+Y=", "gf+9m552B3PnkWnO0o4KdVvjcT3WVHLrCbf1DoVYKFw="], "checkpoint": {"envelope": "rekor.sigstore.dev - 1193050959916656506\n31219265\nEEDRbQekcBvIu2A3f37wAtzpj3Tu+lPYLi9AUyS4FBY=\n\n\u2014 rekor.sigstore.dev wNI9ajBFAiAnUUia2onArhzOpQclqAm9wBFu32/qoYagpd3PkWeELgIhAPUWvc2y6UP8V2I/ABP9HtsQi208X3nuSI8xunycnmZl\n"}}, "canonicalizedBody": "eyJhcGlWZXJzaW9uIjoiMC4wLjEiLCJraW5kIjoiaGFzaGVkcmVrb3JkIiwic3BlYyI6eyJkYXRhIjp7Imhhc2giOnsiYWxnb3JpdGhtIjoic2hhMjU2IiwidmFsdWUiOiJiZmIyNDk2MDk5OTAyMjA0OTFhMWI5Mjg1MGEwNzEzNWVkMDgzMWU0MTczOGNmNjgxZDYzY2YwMWIyYThmYmQxIn19LCJzaWduYXR1cmUiOnsiY29udGVudCI6Ik1FWUNJUUQyYW4xbTUvSWl4clZsYVlpcUMxQmpuamc3eG55MTBxVWw5WHhIM2hJSkNRSWhBS1l4YzRNeTNYTndscEdEU25QTTBjU1gxM3ljMGNnN3BTVVZCS2RrOHZMaiIsInB1YmxpY0tleSI6eyJjb250ZW50IjoiTFMwdExTMUNSVWRKVGlCRFJWSlVTVVpKUTBGVVJTMHRMUzB0Q2sxSlNVTjZSRU5EUVd4TFowRjNTVUpCWjBsVlNEUjNjaXRTUWxOTVNIaHRiMHhsVmxkUlJsZDBUSEpQYVdOcmQwTm5XVWxMYjFwSmVtb3dSVUYzVFhjS1RucEZWazFDVFVkQk1WVkZRMmhOVFdNeWJHNWpNMUoyWTIxVmRWcEhWakpOVWpSM1NFRlpSRlpSVVVSRmVGWjZZVmRrZW1SSE9YbGFVekZ3WW01U2JBcGpiVEZzV2tkc2FHUkhWWGRJYUdOT1RXcFJlRTFxUVhwTlZHZDZUWHBSTUZkb1kwNU5hbEY0VFdwQmVrMVVaekJOZWxFd1YycEJRVTFHYTNkRmQxbElDa3R2V2tsNmFqQkRRVkZaU1V0dldrbDZhakJFUVZGalJGRm5RVVZFZFRkdVpWZG1hbTFYUTI5WGN6UjBiMDkzVFdVMVdsTTFiUzlSYjJRdlNVRlpSMlFLWVdrd05GRnFlQ3RtU2pKS1MwbE5URGhQV0dFek56WjNiVU5TWnlzeGJVVTFUamMxVFRWbk5UVnphbVZJTmtGWE5VdFBRMEZZUlhkblowWjBUVUUwUndwQk1WVmtSSGRGUWk5M1VVVkJkMGxJWjBSQlZFSm5UbFpJVTFWRlJFUkJTMEpuWjNKQ1owVkdRbEZqUkVGNlFXUkNaMDVXU0ZFMFJVWm5VVlZXZUdOdkNrOUVURTlRTm1ObEsyWm1WMVZzUWxvNFpGRndRWFJCZDBoM1dVUldVakJxUWtKbmQwWnZRVlV6T1ZCd2VqRlphMFZhWWpWeFRtcHdTMFpYYVhocE5Ga0tXa1E0ZDBsbldVUldVakJTUVZGSUwwSkNaM2RHYjBWVlkwZEdhV0pIT1c1ak1rWnpVVWhDTldSSGFIWmlhVFYyWTIxamQwdFJXVXRMZDFsQ1FrRkhSQXAyZWtGQ1FWRlJZbUZJVWpCalNFMDJUSGs1YUZreVRuWmtWelV3WTNrMWJtSXlPVzVpUjFWMVdUSTVkRTFEYzBkRGFYTkhRVkZSUW1jM09IZEJVV2RGQ2toUmQySmhTRkl3WTBoTk5reDVPV2haTWs1MlpGYzFNR041Tlc1aU1qbHVZa2RWZFZreU9YUk5TVWRLUW1kdmNrSm5SVVZCWkZvMVFXZFJRMEpJYzBVS1pWRkNNMEZJVlVFelZEQjNZWE5pU0VWVVNtcEhValJqYlZkak0wRnhTa3RZY21wbFVFc3pMMmcwY0hsblF6aHdOMjgwUVVGQlIxUnFZM2syVjFGQlFRcENRVTFCVW1wQ1JVRnBRVmRMYTNCUGJIUkdObVp1WjFSUVJsQnBVSEpxYnpaTmJuZzNSSFpxVkdwb2VTdEpPVU00WVRGRk9FRkpaMFJHU0VwWWEyRk9Dazh2WTFKSVdrTkZlV05FU21aa1kwcHlUV3hFUlVrcmFWUkJZemxIWW1oS2NtVk5kME5uV1VsTGIxcEplbW93UlVGM1RVUmhRVUYzV2xGSmQxSnNZMHdLV2l0TFZISk5XR3RUVDNGdlpWcHJVblJKVFhweVRXaHBVblpxYjAxbVkxbDBOMlF6ZWxncmRDdG1SSFJoZVhkeldVbDFNRmRUVjA1MGQweDFRV3BGUVFwck1VeE5NSE14WXpFemVtNHZiRGxDT1VrNFdVMUVTbmhEYVZWWk1tVmtOVUZMTlRJelZFbDVOelZqYlVnclNWbFBOMWhQUkU5RU9EWlpVMnQ1ZEhaVENpMHRMUzB0UlU1RUlFTkZVbFJKUmtsRFFWUkZMUzB0TFMwSyJ9fX19"}]}, "messageSignature": {"messageDigest": {"algorithm": "SHA2_256", "digest": "v7JJYJmQIgSRobkoUKBxNe0IMeQXOM9oHWPPAbKo+9E="}, "signature": "MEYCIQD2an1m5/IixrVlaYiqC1Bjnjg7xny10qUl9XxH3hIJCQIhAKYxc4My3XNwlpGDSnPM0cSX13yc0cg7pSUVBKdk8vLj"}} diff --git a/Python-3.10.17.tar.xz b/Python-3.10.17.tar.xz new file mode 100644 index 0000000..6c5e82d --- /dev/null +++ b/Python-3.10.17.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c68050f049d1b4ac5aadd0df5f27941c0350d2a9e7ab0907ee5eb5225d9d6b0 +size 19608144 diff --git a/Python-3.10.17.tar.xz.sigstore b/Python-3.10.17.tar.xz.sigstore new file mode 100644 index 0000000..7413c69 --- /dev/null +++ b/Python-3.10.17.tar.xz.sigstore @@ -0,0 +1 @@ +{"mediaType": "application/vnd.dev.sigstore.bundle.v0.3+json", "verificationMaterial": {"certificate": {"rawBytes": "MIICzzCCAlSgAwIBAgIUI5tsj9NzdgrO+5YskNyoC+qi8vkwCgYIKoZIzj0EAwMwNzEVMBMGA1UEChMMc2lnc3RvcmUuZGV2MR4wHAYDVQQDExVzaWdzdG9yZS1pbnRlcm1lZGlhdGUwHhcNMjUwNDA4MTMyMzU4WhcNMjUwNDA4MTMzMzU4WjAAMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEAv6UJQmrkdgLDaQZmsfd0+gKL2DB6IBsuTQ7oauCQQ3l9hD+hyV5dIcacEb6/y+cfdsll0A0sDGcfJxqInKdbqOCAXMwggFvMA4GA1UdDwEB/wQEAwIHgDATBgNVHSUEDDAKBggrBgEFBQcDAzAdBgNVHQ4EFgQUbIExDLYBM5EaJKSM42GWOQ+p+4EwHwYDVR0jBBgwFoAU39Ppz1YkEZb5qNjpKFWixi4YZD8wIgYDVR0RAQH/BBgwFoEUcGFibG9nc2FsQHB5dGhvbi5vcmcwKQYKKwYBBAGDvzABAQQbaHR0cHM6Ly9hY2NvdW50cy5nb29nbGUuY29tMCsGCisGAQQBg78wAQgEHQwbaHR0cHM6Ly9hY2NvdW50cy5nb29nbGUuY29tMIGLBgorBgEEAdZ5AgQCBH0EewB5AHcA3T0wasbHETJjGR4cmWc3AqJKXrjePK3/h4pygC8p7o4AAAGWFZJpOwAABAMASDBGAiEA41BGN2vh87VMWZ04uMz41nJe9XjHclR25kZymgE4EoUCIQDcq1G4PeYggbgsgJRK/wA2oT/9c66Ut00r4FTtzKp8nzAKBggqhkjOPQQDAwNpADBmAjEAiQAaAbnKP6BK0IW3WSeDIxogOIzNlO8A5XBjpD+0gPOJTrdXKlNnpwrIg5IEzVFuAjEAio/NN8hD96Rpy+vU8Gejg6xrGYW7kDhfZfGhDQ7ZCXbG5k/Ue9azE/+dOlZ3zfUe"}, "tlogEntries": [{"logIndex": "193846451", "logId": {"keyId": "wNI9atQGlz+VWfO6LRygH4QUfY/8W4RFwiT5i5WRgB0="}, "kindVersion": {"kind": "hashedrekord", "version": "0.0.1"}, "integratedTime": "1744118639", "inclusionPromise": {"signedEntryTimestamp": "MEUCIFxLjN8+W16mUiOJzYXkED4rZG+LGsnmcbCknQ+GXGhuAiEA6ARsL3PI6HN7vz2jY2Ef3lzIUqNXJ3fFN08xH1LdWyM="}, "inclusionProof": {"logIndex": "71942189", "rootHash": "t0jBkeXT4fpLCFcUfGvPMrTn6cGyGgGput6RoghhPSM=", "treeSize": "71942196", "hashes": ["+smebvByxaA1Ma1XWJKpZpS5bT3MTjkWgbE8QsnP7iM=", "KTftkiWp8T5wzTX2uRjjb9cOPgzQYm12kVViECWEcF0=", "eT+T8QsO14DNUNRvdA8DN3nkWATbZNBttN7hMwLhDRs=", "/cpMfdkyRFEgNofmHSovLaOnUrMdzl1GlnYJQ83emgU=", "yYb3Qj3G9bz700MryqKxLQkwbVYczRq5u/0VXtsPV2Y=", "yOOivaVwYhqQJnOzhyJxD03KD1BxbsqOm30ZuiDpf6M=", "Pz/WMQQ6nBmkX4L+rVteCufItRYXtXpzlTBnxzaVr8E=", "cuMOBvg9q/3wCGMfCdrFlvXHmcIXecnD3xPny77dAWw=", "wz8AVqzGBjixNiXtnCb16MFP7zOW54eYx/zJ/1Jey/E=", "K26LG80DXyb+bC58c4Nw00WigG52v0PCsZGY3ExGsts=", "WEm5OgPzJpYROv+4CcrieexCYyQKrLUH3hbxmcQQ+DM=", "7v8qPHNDLerpduaMx06eb/MwgoQwczTn/cYGKX/9wZ4="], "checkpoint": {"envelope": "rekor.sigstore.dev - 1193050959916656506\n71942196\nt0jBkeXT4fpLCFcUfGvPMrTn6cGyGgGput6RoghhPSM=\n\n\u2014 rekor.sigstore.dev wNI9ajBGAiEAp55/To5P2lvHGyciQR/vCYaZ5R5972Hzrj7ZIYnqDk0CIQCEZbKDx3oGXIV5S0tYiR+MrDRDDV5ly/Dep8URvrU4xw==\n"}}, "canonicalizedBody": "eyJhcGlWZXJzaW9uIjoiMC4wLjEiLCJraW5kIjoiaGFzaGVkcmVrb3JkIiwic3BlYyI6eyJkYXRhIjp7Imhhc2giOnsiYWxnb3JpdGhtIjoic2hhMjU2IiwidmFsdWUiOiI0YzY4MDUwZjA0OWQxYjRhYzVhYWRkMGRmNWYyNzk0MWMwMzUwZDJhOWU3YWIwOTA3ZWU1ZWI1MjI1ZDlkNmIwIn19LCJzaWduYXR1cmUiOnsiY29udGVudCI6Ik1FVUNJUUR4QUFKRUhOaDY3NzJjQUNWNlFtWEVZK3k5UHA1Z2twUlpuZTZmRFFOazRBSWdaMDJVN1BvNFlYNDRZRTFwdHQ3RHh6MDlCSE5XLzRucjhmdzNVUHdkUStNPSIsInB1YmxpY0tleSI6eyJjb250ZW50IjoiTFMwdExTMUNSVWRKVGlCRFJWSlVTVVpKUTBGVVJTMHRMUzB0Q2sxSlNVTjZla05EUVd4VFowRjNTVUpCWjBsVlNUVjBjMm81VG5wa1ozSlBLelZaYzJ0T2VXOURLM0ZwT0hacmQwTm5XVWxMYjFwSmVtb3dSVUYzVFhjS1RucEZWazFDVFVkQk1WVkZRMmhOVFdNeWJHNWpNMUoyWTIxVmRWcEhWakpOVWpSM1NFRlpSRlpSVVVSRmVGWjZZVmRrZW1SSE9YbGFVekZ3WW01U2JBcGpiVEZzV2tkc2FHUkhWWGRJYUdOT1RXcFZkMDVFUVRSTlZFMTVUWHBWTkZkb1kwNU5hbFYzVGtSQk5FMVVUWHBOZWxVMFYycEJRVTFHYTNkRmQxbElDa3R2V2tsNmFqQkRRVkZaU1V0dldrbDZhakJFUVZGalJGRm5RVVZCZGpaVlNsRnRjbXRrWjB4RVlWRmFiWE5tWkRBclowdE1Na1JDTmtsQ2MzVlVVVGNLYjJGMVExRlJNMnc1YUVRcmFIbFdOV1JKWTJGalJXSTJMM2tyWTJaa2MyeHNNRUV3YzBSSFkyWktlSEZKYmt0a1luRlBRMEZZVFhkblowWjJUVUUwUndwQk1WVmtSSGRGUWk5M1VVVkJkMGxJWjBSQlZFSm5UbFpJVTFWRlJFUkJTMEpuWjNKQ1owVkdRbEZqUkVGNlFXUkNaMDVXU0ZFMFJVWm5VVlZpU1VWNENrUk1XVUpOTlVWaFNrdFRUVFF5UjFkUFVTdHdLelJGZDBoM1dVUldVakJxUWtKbmQwWnZRVlV6T1ZCd2VqRlphMFZhWWpWeFRtcHdTMFpYYVhocE5Ga0tXa1E0ZDBsbldVUldVakJTUVZGSUwwSkNaM2RHYjBWVlkwZEdhV0pIT1c1ak1rWnpVVWhDTldSSGFIWmlhVFYyWTIxamQwdFJXVXRMZDFsQ1FrRkhSQXAyZWtGQ1FWRlJZbUZJVWpCalNFMDJUSGs1YUZreVRuWmtWelV3WTNrMWJtSXlPVzVpUjFWMVdUSTVkRTFEYzBkRGFYTkhRVkZSUW1jM09IZEJVV2RGQ2toUmQySmhTRkl3WTBoTk5reDVPV2haTWs1MlpGYzFNR041Tlc1aU1qbHVZa2RWZFZreU9YUk5TVWRNUW1kdmNrSm5SVVZCWkZvMVFXZFJRMEpJTUVVS1pYZENOVUZJWTBFelZEQjNZWE5pU0VWVVNtcEhValJqYlZkak0wRnhTa3RZY21wbFVFc3pMMmcwY0hsblF6aHdOMjgwUVVGQlIxZEdXa3B3VDNkQlFRcENRVTFCVTBSQ1IwRnBSVUUwTVVKSFRqSjJhRGczVmsxWFdqQTBkVTE2TkRGdVNtVTVXR3BJWTJ4U01qVnJXbmx0WjBVMFJXOVZRMGxSUkdOeE1VYzBDbEJsV1dkblltZHpaMHBTU3k5M1FUSnZWQzg1WXpZMlZYUXdNSEkwUmxSMGVrdHdPRzU2UVV0Q1oyZHhhR3RxVDFCUlVVUkJkMDV3UVVSQ2JVRnFSVUVLYVZGQllVRmlia3RRTmtKTE1FbFhNMWRUWlVSSmVHOW5UMGw2VG14UE9FRTFXRUpxY0VRck1HZFFUMHBVY21SWVMyeE9ibkIzY2tsbk5VbEZlbFpHZFFwQmFrVkJhVzh2VGs0NGFFUTVObEp3ZVN0MlZUaEhaV3BuTm5oeVIxbFhOMnRFYUdaYVprZG9SRkUzV2tOWVlrYzFheTlWWlRsaGVrVXZLMlJQYkZvekNucG1WV1VLTFMwdExTMUZUa1FnUTBWU1ZFbEdTVU5CVkVVdExTMHRMUW89In19fX0="}], "timestampVerificationData": {}}, "messageSignature": {"messageDigest": {"algorithm": "SHA2_256", "digest": "TGgFDwSdG0rFqt0N9fJ5QcA1DSqeerCQfuXrUiXZ1rA="}, "signature": "MEUCIQDxAAJEHNh6772cACV6QmXEY+y9Pp5gkpRZne6fDQNk4AIgZ02U7Po4YX44YE1ptt7Dxz09BHNW/4nr8fw3UPwdQ+M="}} diff --git a/fix_configure_rst.patch b/fix_configure_rst.patch index 46067d1..7592d99 100644 --- a/fix_configure_rst.patch +++ b/fix_configure_rst.patch @@ -3,9 +3,11 @@ Misc/NEWS | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) ---- a/Doc/using/configure.rst -+++ b/Doc/using/configure.rst -@@ -42,7 +42,6 @@ General Options +Index: Python-3.10.17/Doc/using/configure.rst +=================================================================== +--- Python-3.10.17.orig/Doc/using/configure.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/using/configure.rst 2025-04-11 10:07:56.572228089 +0200 +@@ -42,7 +42,6 @@ See :data:`sys.int_info.bits_per_digit `. @@ -13,7 +15,7 @@ .. cmdoption:: --with-cxx-main=COMPILER Compile the Python ``main()`` function and link Python executable with C++ -@@ -473,13 +472,11 @@ macOS Options +@@ -473,13 +472,11 @@ See ``Mac/README.rst``. @@ -27,9 +29,11 @@ .. cmdoption:: --enable-framework=INSTALLDIR Create a Python.framework rather than a traditional Unix install. Optional ---- a/Misc/NEWS -+++ b/Misc/NEWS -@@ -3810,7 +3810,7 @@ C API +Index: Python-3.10.17/Misc/NEWS +=================================================================== +--- Python-3.10.17.orig/Misc/NEWS 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Misc/NEWS 2025-04-11 10:07:56.576558000 +0200 +@@ -3903,7 +3903,7 @@ ----- - bpo-43795: The list in :ref:`stable-abi-list` now shows the public name diff --git a/python310.changes b/python310.changes index aa566b0..76e6103 100644 --- a/python310.changes +++ b/python310.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +Fri Apr 11 08:12:14 UTC 2025 - Matej Cepl + +- Update to 3.10.17: + - gh-131809: Update bundled libexpat to 2.7.1 + - gh-131261: Upgrade to libexpat 2.7.0 + - gh-105704: When using urllib.parse.urlsplit() and + urllib.parse.urlparse() host parsing would not reject domain + names containing square brackets ([ and ]). Square brackets + are only valid for IPv6 and IPvFuture hosts according to RFC + 3986 Section 3.2.2 (bsc#1236705, CVE-2025-0938, + gh#python/cpython#105704). + - gh-121284: Fix bug in the folding of rfc2047 encoded-words + when flattening an email message using a modern email + policy. Previously when an encoded-word was too long for + a line, it would be decoded, split across lines, and + re-encoded. But commas and other special characters in the + original text could be left unencoded and unquoted. This + could theoretically be used to spoof header lines using a + carefully constructed encoded-word if the resulting rendered + email was transmitted or re-parsed. + - gh-80222: Fix bug in the folding of quoted strings + when flattening an email message using a modern email + policy. Previously when a quoted string was folded so that + it spanned more than one line, the surrounding quotes and + internal escapes would be omitted. This could theoretically + be used to spoof header lines using a carefully constructed + quoted string if the resulting rendered email was transmitted + or re-parsed. + - gh-119511: Fix a potential denial of service in the imaplib + module. When connecting to a malicious server, it could + cause an arbitrary amount of memory to be allocated. On many + systems this is harmless as unused virtual memory is only + a mapping, but if this hit a virtual address size limit + it could lead to a MemoryError or other process crash. On + unusual systems or builds where all allocated memory is + touched and backed by actual ram or storage it could’ve + consumed resources doing so until similarly crashing. + - gh-127257: In ssl, system call failures that OpenSSL reports + using ERR_LIB_SYS are now raised as OSError. + - gh-121277: Writers of CPython’s documentation can now use + next as the version for the versionchanged, versionadded, + deprecated directives. +- Remote upstreamed patch: + - CVE-2025-0938-sq-brackets-domain-names.patch + ------------------------------------------------------------------- Mon Mar 10 15:44:31 UTC 2025 - Bernhard Wiedemann diff --git a/python310.spec b/python310.spec index a0c2713..d8dad88 100644 --- a/python310.spec +++ b/python310.spec @@ -108,7 +108,7 @@ Obsoletes: python39%{?1:-%{1}} # _md5.cpython-38m-x86_64-linux-gnu.so %define dynlib() %{sitedir}/lib-dynload/%{1}.cpython-%{abi_tag}-%{archname}-%{_os}%{?_gnu}%{?armsuffix}.so Name: %{python_pkg_name}%{psuffix} -Version: 3.10.16 +Version: 3.10.17 Release: 0 Summary: Python 3 Interpreter License: Python-2.0 @@ -204,9 +204,6 @@ Patch27: gh120226-fix-sendfile-test-kernel-610.patch # PATCH-FIX-UPSTREAM sphinx-802.patch mcepl@suse.com # status_iterator method moved between the Sphinx versions Patch28: sphinx-802.patch -# PATCH-FIX-UPSTREAM CVE-2025-0938-sq-brackets-domain-names.patch bsc#1236705 mcepl@suse.com -# functions `urllib.parse.urlsplit` and `urlparse` accept domain names including square brackets -Patch29: CVE-2025-0938-sq-brackets-domain-names.patch BuildRequires: autoconf-archive BuildRequires: automake BuildRequires: fdupes @@ -490,7 +487,6 @@ other applications. %patch -p1 -P 24 %patch -p1 -P 27 %patch -p1 -P 28 -%patch -p1 -P 29 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac diff --git a/sphinx-72.patch b/sphinx-72.patch index 39de7e1..7286ddd 100644 --- a/sphinx-72.patch +++ b/sphinx-72.patch @@ -73,8 +73,10 @@ Doc/tutorial/stdlib.rst | 2 72 files changed, 458 insertions(+), 427 deletions(-) ---- a/Doc/c-api/bytearray.rst -+++ b/Doc/c-api/bytearray.rst +Index: Python-3.10.17/Doc/c-api/bytearray.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/bytearray.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/bytearray.rst 2025-04-11 10:08:04.181382404 +0200 @@ -5,7 +5,7 @@ Byte Array Objects ------------------ @@ -84,9 +86,11 @@ .. c:type:: PyByteArrayObject ---- a/Doc/c-api/bytes.rst -+++ b/Doc/c-api/bytes.rst -@@ -8,7 +8,7 @@ Bytes Objects +Index: Python-3.10.17/Doc/c-api/bytes.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/bytes.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/bytes.rst 2025-04-11 10:08:04.181517129 +0200 +@@ -8,7 +8,7 @@ These functions raise :exc:`TypeError` when expecting a bytes parameter and called with a non-bytes parameter. @@ -95,8 +99,10 @@ .. c:type:: PyBytesObject ---- a/Doc/c-api/capsule.rst -+++ b/Doc/c-api/capsule.rst +Index: Python-3.10.17/Doc/c-api/capsule.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/capsule.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/capsule.rst 2025-04-11 10:08:04.181988281 +0200 @@ -5,7 +5,7 @@ Capsules -------- @@ -106,8 +112,10 @@ Refer to :ref:`using-capsules` for more information on using these objects. ---- a/Doc/c-api/complex.rst -+++ b/Doc/c-api/complex.rst +Index: Python-3.10.17/Doc/c-api/complex.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/complex.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/complex.rst 2025-04-11 10:08:04.182165400 +0200 @@ -5,7 +5,7 @@ Complex Number Objects ---------------------- @@ -117,9 +125,11 @@ Python's complex number objects are implemented as two distinct types when viewed from the C API: one is the Python object exposed to Python programs, and ---- a/Doc/c-api/concrete.rst -+++ b/Doc/c-api/concrete.rst -@@ -40,7 +40,7 @@ This section describes Python type objec +Index: Python-3.10.17/Doc/c-api/concrete.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/concrete.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/concrete.rst 2025-04-11 10:08:04.182394900 +0200 +@@ -40,7 +40,7 @@ Numeric Objects =============== @@ -128,7 +138,7 @@ .. toctree:: -@@ -55,7 +55,7 @@ Numeric Objects +@@ -55,7 +55,7 @@ Sequence Objects ================ @@ -137,7 +147,7 @@ Generic operations on sequence objects were discussed in the previous chapter; this section deals with the specific kinds of sequence objects that are -@@ -77,7 +77,7 @@ intrinsic to the Python language. +@@ -77,7 +77,7 @@ Container Objects ================= @@ -146,8 +156,10 @@ .. toctree:: ---- a/Doc/c-api/dict.rst -+++ b/Doc/c-api/dict.rst +Index: Python-3.10.17/Doc/c-api/dict.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/dict.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/dict.rst 2025-04-11 10:08:04.182580470 +0200 @@ -5,7 +5,7 @@ Dictionary Objects ------------------ @@ -157,7 +169,7 @@ .. c:type:: PyDictObject -@@ -154,7 +154,7 @@ Dictionary Objects +@@ -154,7 +154,7 @@ .. c:function:: Py_ssize_t PyDict_Size(PyObject *p) @@ -166,9 +178,11 @@ Return the number of items in the dictionary. This is equivalent to ``len(p)`` on a dictionary. ---- a/Doc/c-api/exceptions.rst -+++ b/Doc/c-api/exceptions.rst -@@ -503,7 +503,7 @@ Signal Handling +Index: Python-3.10.17/Doc/c-api/exceptions.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/exceptions.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/exceptions.rst 2025-04-11 10:08:04.182849151 +0200 +@@ -503,7 +503,7 @@ .. c:function:: int PyErr_CheckSignals() .. index:: @@ -177,7 +191,7 @@ single: SIGINT single: KeyboardInterrupt (built-in exception) -@@ -534,7 +534,7 @@ Signal Handling +@@ -534,7 +534,7 @@ .. c:function:: void PyErr_SetInterrupt() .. index:: @@ -186,7 +200,7 @@ single: SIGINT single: KeyboardInterrupt (built-in exception) -@@ -549,7 +549,7 @@ Signal Handling +@@ -549,7 +549,7 @@ .. c:function:: int PyErr_SetInterruptEx(int signum) .. index:: @@ -195,8 +209,10 @@ single: KeyboardInterrupt (built-in exception) Simulate the effect of a signal arriving. The next time ---- a/Doc/c-api/file.rst -+++ b/Doc/c-api/file.rst +Index: Python-3.10.17/Doc/c-api/file.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/file.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/file.rst 2025-04-11 10:08:04.183114201 +0200 @@ -5,7 +5,7 @@ File Objects ------------ @@ -206,8 +222,10 @@ These APIs are a minimal emulation of the Python 2 C API for built-in file objects, which used to rely on the buffered I/O (:c:expr:`FILE*`) support ---- a/Doc/c-api/float.rst -+++ b/Doc/c-api/float.rst +Index: Python-3.10.17/Doc/c-api/float.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/float.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/float.rst 2025-04-11 10:08:04.183287199 +0200 @@ -5,7 +5,7 @@ Floating Point Objects ---------------------- @@ -217,8 +235,10 @@ .. c:type:: PyFloatObject ---- a/Doc/c-api/function.rst -+++ b/Doc/c-api/function.rst +Index: Python-3.10.17/Doc/c-api/function.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/function.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/function.rst 2025-04-11 10:08:04.183469486 +0200 @@ -5,7 +5,7 @@ Function Objects ---------------- @@ -228,9 +248,11 @@ There are a few functions specific to Python functions. ---- a/Doc/c-api/import.rst -+++ b/Doc/c-api/import.rst -@@ -41,7 +41,7 @@ Importing Modules +Index: Python-3.10.17/Doc/c-api/import.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/import.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/import.rst 2025-04-11 10:08:04.183652332 +0200 +@@ -41,7 +41,7 @@ .. c:function:: PyObject* PyImport_ImportModuleEx(const char *name, PyObject *globals, PyObject *locals, PyObject *fromlist) @@ -239,7 +261,7 @@ Import a module. This is best described by referring to the built-in Python function :func:`__import__`. -@@ -120,7 +120,7 @@ Importing Modules +@@ -120,7 +120,7 @@ .. c:function:: PyObject* PyImport_ExecCodeModule(const char *name, PyObject *co) @@ -248,9 +270,11 @@ Given a module name (possibly of the form ``package.module``) and a code object read from a Python bytecode file or obtained from the built-in function ---- a/Doc/c-api/init.rst -+++ b/Doc/c-api/init.rst -@@ -233,9 +233,9 @@ Initializing and finalizing the interpre +Index: Python-3.10.17/Doc/c-api/init.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/init.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/init.rst 2025-04-11 10:08:04.184122856 +0200 +@@ -233,9 +233,9 @@ single: PyEval_InitThreads() single: modules (in module sys) single: path (in module sys) @@ -263,7 +287,7 @@ triple: module; search; path single: PySys_SetArgv() single: PySys_SetArgvEx() -@@ -895,7 +895,7 @@ code, or when embedding the Python inter +@@ -895,7 +895,7 @@ .. deprecated-removed:: 3.9 3.11 @@ -272,7 +296,7 @@ .. c:function:: int PyEval_ThreadsInitialized() -@@ -1315,9 +1315,9 @@ function. You can create and destroy the +@@ -1315,9 +1315,9 @@ .. c:function:: PyThreadState* Py_NewInterpreter() .. index:: @@ -285,9 +309,11 @@ single: stdout (in module sys) single: stderr (in module sys) single: stdin (in module sys) ---- a/Doc/c-api/intro.rst -+++ b/Doc/c-api/intro.rst -@@ -226,7 +226,7 @@ complete listing. +Index: Python-3.10.17/Doc/c-api/intro.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/intro.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/intro.rst 2025-04-11 10:08:04.184639406 +0200 +@@ -226,7 +226,7 @@ Objects, Types and Reference Counts =================================== @@ -296,7 +322,7 @@ Most Python/C API functions have one or more arguments as well as a return value of type :c:expr:`PyObject*`. This type is a pointer to an opaque data type -@@ -677,9 +677,9 @@ interpreter can only be used after the i +@@ -677,9 +677,9 @@ .. index:: single: Py_Initialize() @@ -309,8 +335,10 @@ triple: module; search; path single: path (in module sys) ---- a/Doc/c-api/list.rst -+++ b/Doc/c-api/list.rst +Index: Python-3.10.17/Doc/c-api/list.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/list.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/list.rst 2025-04-11 10:08:04.184885109 +0200 @@ -5,7 +5,7 @@ List Objects ------------ @@ -320,7 +348,7 @@ .. c:type:: PyListObject -@@ -45,7 +45,7 @@ List Objects +@@ -45,7 +45,7 @@ .. c:function:: Py_ssize_t PyList_Size(PyObject *list) @@ -329,7 +357,7 @@ Return the length of the list object in *list*; this is equivalent to ``len(list)`` on a list object. -@@ -138,7 +138,7 @@ List Objects +@@ -138,7 +138,7 @@ .. c:function:: PyObject* PyList_AsTuple(PyObject *list) @@ -338,8 +366,10 @@ Return a new tuple object containing the contents of *list*; equivalent to ``tuple(list)``. ---- a/Doc/c-api/long.rst -+++ b/Doc/c-api/long.rst +Index: Python-3.10.17/Doc/c-api/long.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/long.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/long.rst 2025-04-11 10:08:04.185061390 +0200 @@ -5,8 +5,8 @@ Integer Objects --------------- @@ -351,9 +381,11 @@ All integers are implemented as "long" integer objects of arbitrary size. ---- a/Doc/c-api/mapping.rst -+++ b/Doc/c-api/mapping.rst -@@ -20,7 +20,7 @@ See also :c:func:`PyObject_GetItem`, :c: +Index: Python-3.10.17/Doc/c-api/mapping.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/mapping.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/mapping.rst 2025-04-11 10:08:04.185248635 +0200 +@@ -20,7 +20,7 @@ .. c:function:: Py_ssize_t PyMapping_Size(PyObject *o) Py_ssize_t PyMapping_Length(PyObject *o) @@ -362,8 +394,10 @@ Returns the number of keys in object *o* on success, and ``-1`` on failure. This is equivalent to the Python expression ``len(o)``. ---- a/Doc/c-api/memoryview.rst -+++ b/Doc/c-api/memoryview.rst +Index: Python-3.10.17/Doc/c-api/memoryview.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/memoryview.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/memoryview.rst 2025-04-11 10:08:04.185439653 +0200 @@ -3,7 +3,7 @@ .. _memoryview-objects: @@ -373,8 +407,10 @@ MemoryView objects ------------------ ---- a/Doc/c-api/method.rst -+++ b/Doc/c-api/method.rst +Index: Python-3.10.17/Doc/c-api/method.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/method.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/method.rst 2025-04-11 10:08:04.185619635 +0200 @@ -5,7 +5,7 @@ Instance Method Objects ----------------------- @@ -384,7 +420,7 @@ An instance method is a wrapper for a :c:data:`PyCFunction` and the new way to bind a :c:data:`PyCFunction` to a class object. It replaces the former call -@@ -47,7 +47,7 @@ to bind a :c:data:`PyCFunction` to a cla +@@ -47,7 +47,7 @@ Method Objects -------------- @@ -393,8 +429,10 @@ Methods are bound function objects. Methods are always bound to an instance of a user-defined class. Unbound methods (methods bound to a class object) are ---- a/Doc/c-api/module.rst -+++ b/Doc/c-api/module.rst +Index: Python-3.10.17/Doc/c-api/module.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/module.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/module.rst 2025-04-11 10:08:04.185827344 +0200 @@ -5,7 +5,7 @@ Module Objects -------------- @@ -404,8 +442,10 @@ .. c:var:: PyTypeObject PyModule_Type ---- a/Doc/c-api/none.rst -+++ b/Doc/c-api/none.rst +Index: Python-3.10.17/Doc/c-api/none.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/none.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/none.rst 2025-04-11 10:08:04.186046717 +0200 @@ -5,7 +5,7 @@ The ``None`` Object ------------------- @@ -415,9 +455,11 @@ Note that the :c:type:`PyTypeObject` for ``None`` is not directly exposed in the Python/C API. Since ``None`` is a singleton, testing for object identity (using ---- a/Doc/c-api/number.rst -+++ b/Doc/c-api/number.rst -@@ -64,7 +64,7 @@ Number Protocol +Index: Python-3.10.17/Doc/c-api/number.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/number.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/number.rst 2025-04-11 10:08:04.186225931 +0200 +@@ -64,7 +64,7 @@ .. c:function:: PyObject* PyNumber_Divmod(PyObject *o1, PyObject *o2) @@ -426,7 +468,7 @@ See the built-in function :func:`divmod`. Returns ``NULL`` on failure. This is the equivalent of the Python expression ``divmod(o1, o2)``. -@@ -72,7 +72,7 @@ Number Protocol +@@ -72,7 +72,7 @@ .. c:function:: PyObject* PyNumber_Power(PyObject *o1, PyObject *o2, PyObject *o3) @@ -435,7 +477,7 @@ See the built-in function :func:`pow`. Returns ``NULL`` on failure. This is the equivalent of the Python expression ``pow(o1, o2, o3)``, where *o3* is optional. -@@ -94,7 +94,7 @@ Number Protocol +@@ -94,7 +94,7 @@ .. c:function:: PyObject* PyNumber_Absolute(PyObject *o) @@ -444,7 +486,7 @@ Returns the absolute value of *o*, or ``NULL`` on failure. This is the equivalent of the Python expression ``abs(o)``. -@@ -192,7 +192,7 @@ Number Protocol +@@ -192,7 +192,7 @@ .. c:function:: PyObject* PyNumber_InPlacePower(PyObject *o1, PyObject *o2, PyObject *o3) @@ -453,7 +495,7 @@ See the built-in function :func:`pow`. Returns ``NULL`` on failure. The operation is done *in-place* when *o1* supports it. This is the equivalent of the Python -@@ -238,7 +238,7 @@ Number Protocol +@@ -238,7 +238,7 @@ .. c:function:: PyObject* PyNumber_Long(PyObject *o) @@ -462,7 +504,7 @@ Returns the *o* converted to an integer object on success, or ``NULL`` on failure. This is the equivalent of the Python expression ``int(o)``. -@@ -246,7 +246,7 @@ Number Protocol +@@ -246,7 +246,7 @@ .. c:function:: PyObject* PyNumber_Float(PyObject *o) @@ -471,9 +513,11 @@ Returns the *o* converted to a float object on success, or ``NULL`` on failure. This is the equivalent of the Python expression ``float(o)``. ---- a/Doc/c-api/object.rst -+++ b/Doc/c-api/object.rst -@@ -172,7 +172,7 @@ Object Protocol +Index: Python-3.10.17/Doc/c-api/object.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/object.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/object.rst 2025-04-11 10:08:04.186419533 +0200 +@@ -172,7 +172,7 @@ .. c:function:: PyObject* PyObject_Repr(PyObject *o) @@ -482,7 +526,7 @@ Compute a string representation of object *o*. Returns the string representation on success, ``NULL`` on failure. This is the equivalent of the -@@ -184,7 +184,7 @@ Object Protocol +@@ -184,7 +184,7 @@ .. c:function:: PyObject* PyObject_ASCII(PyObject *o) @@ -491,7 +535,7 @@ As :c:func:`PyObject_Repr`, compute a string representation of object *o*, but escape the non-ASCII characters in the string returned by -@@ -209,7 +209,7 @@ Object Protocol +@@ -209,7 +209,7 @@ .. c:function:: PyObject* PyObject_Bytes(PyObject *o) @@ -500,7 +544,7 @@ Compute a bytes representation of object *o*. ``NULL`` is returned on failure and a bytes object on success. This is equivalent to the Python -@@ -260,7 +260,7 @@ Object Protocol +@@ -260,7 +260,7 @@ .. c:function:: Py_hash_t PyObject_Hash(PyObject *o) @@ -509,7 +553,7 @@ Compute and return the hash value of an object *o*. On failure, return ``-1``. This is the equivalent of the Python expression ``hash(o)``. -@@ -294,7 +294,7 @@ Object Protocol +@@ -294,7 +294,7 @@ .. c:function:: PyObject* PyObject_Type(PyObject *o) @@ -518,7 +562,7 @@ When *o* is non-``NULL``, returns a type object corresponding to the object type of object *o*. On failure, raises :exc:`SystemError` and returns ``NULL``. This -@@ -315,7 +315,7 @@ Object Protocol +@@ -315,7 +315,7 @@ .. c:function:: Py_ssize_t PyObject_Size(PyObject *o) Py_ssize_t PyObject_Length(PyObject *o) @@ -527,9 +571,11 @@ Return the length of object *o*. If the object *o* provides either the sequence and mapping protocols, the sequence length is returned. On error, ``-1`` is ---- a/Doc/c-api/sequence.rst -+++ b/Doc/c-api/sequence.rst -@@ -18,7 +18,7 @@ Sequence Protocol +Index: Python-3.10.17/Doc/c-api/sequence.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/sequence.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/sequence.rst 2025-04-11 10:08:04.186642747 +0200 +@@ -18,7 +18,7 @@ .. c:function:: Py_ssize_t PySequence_Size(PyObject *o) Py_ssize_t PySequence_Length(PyObject *o) @@ -538,7 +584,7 @@ Returns the number of objects in sequence *o* on success, and ``-1`` on failure. This is equivalent to the Python expression ``len(o)``. -@@ -120,7 +120,7 @@ Sequence Protocol +@@ -120,7 +120,7 @@ .. c:function:: PyObject* PySequence_Tuple(PyObject *o) @@ -547,9 +593,11 @@ Return a tuple object with the same contents as the sequence or iterable *o*, or ``NULL`` on failure. If *o* is a tuple, a new reference will be returned, ---- a/Doc/c-api/set.rst -+++ b/Doc/c-api/set.rst -@@ -9,8 +9,8 @@ Set Objects +Index: Python-3.10.17/Doc/c-api/set.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/set.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/set.rst 2025-04-11 10:08:04.186889917 +0200 +@@ -9,8 +9,8 @@ .. index:: @@ -560,7 +608,7 @@ This section details the public API for :class:`set` and :class:`frozenset` objects. Any functionality not listed below is best accessed using either -@@ -107,7 +107,7 @@ or :class:`frozenset` or instances of th +@@ -107,7 +107,7 @@ .. c:function:: Py_ssize_t PySet_Size(PyObject *anyset) @@ -569,9 +617,11 @@ Return the length of a :class:`set` or :class:`frozenset` object. Equivalent to ``len(anyset)``. Raises a :exc:`PyExc_SystemError` if *anyset* is not a ---- a/Doc/c-api/structures.rst -+++ b/Doc/c-api/structures.rst -@@ -351,7 +351,7 @@ method. +Index: Python-3.10.17/Doc/c-api/structures.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/structures.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/structures.rst 2025-04-11 10:08:04.187082262 +0200 +@@ -351,7 +351,7 @@ .. data:: METH_CLASS @@ -580,7 +630,7 @@ The method will be passed the type object as the first parameter rather than an instance of the type. This is used to create *class methods*, -@@ -361,7 +361,7 @@ method. +@@ -361,7 +361,7 @@ .. data:: METH_STATIC @@ -589,8 +639,10 @@ The method will be passed ``NULL`` as the first parameter rather than an instance of the type. This is used to create *static methods*, similar to ---- a/Doc/c-api/tuple.rst -+++ b/Doc/c-api/tuple.rst +Index: Python-3.10.17/Doc/c-api/tuple.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/tuple.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/tuple.rst 2025-04-11 10:08:04.187302473 +0200 @@ -5,7 +5,7 @@ Tuple Objects ------------- @@ -600,8 +652,10 @@ .. c:type:: PyTupleObject ---- a/Doc/c-api/type.rst -+++ b/Doc/c-api/type.rst +Index: Python-3.10.17/Doc/c-api/type.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/type.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/type.rst 2025-04-11 10:08:04.187497471 +0200 @@ -5,7 +5,7 @@ Type Objects ------------ @@ -611,9 +665,11 @@ .. c:type:: PyTypeObject ---- a/Doc/c-api/typeobj.rst -+++ b/Doc/c-api/typeobj.rst -@@ -803,7 +803,7 @@ and :c:type:`PyType_Type` effectively ac +Index: Python-3.10.17/Doc/c-api/typeobj.rst +=================================================================== +--- Python-3.10.17.orig/Doc/c-api/typeobj.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/c-api/typeobj.rst 2025-04-11 10:08:04.187822445 +0200 +@@ -803,7 +803,7 @@ .. c:member:: reprfunc PyTypeObject.tp_repr @@ -622,7 +678,7 @@ An optional pointer to a function that implements the built-in function :func:`repr`. -@@ -868,7 +868,7 @@ and :c:type:`PyType_Type` effectively ac +@@ -868,7 +868,7 @@ .. c:member:: hashfunc PyTypeObject.tp_hash @@ -631,9 +687,11 @@ An optional pointer to a function that implements the built-in function :func:`hash`. ---- a/Doc/conf.py -+++ b/Doc/conf.py -@@ -61,6 +61,11 @@ smartquotes_excludes = { +Index: Python-3.10.17/Doc/conf.py +=================================================================== +--- Python-3.10.17.orig/Doc/conf.py 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/conf.py 2025-04-11 10:08:04.188263705 +0200 +@@ -61,6 +61,11 @@ # Avoid a warning with Sphinx >= 2.0 master_doc = 'contents' @@ -645,9 +703,11 @@ # Options for HTML output # ----------------------- ---- a/Doc/extending/newtypes.rst -+++ b/Doc/extending/newtypes.rst -@@ -149,7 +149,7 @@ done. This can be done using the :c:fun +Index: Python-3.10.17/Doc/extending/newtypes.rst +=================================================================== +--- Python-3.10.17.orig/Doc/extending/newtypes.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/extending/newtypes.rst 2025-04-11 10:08:04.188492367 +0200 +@@ -149,7 +149,7 @@ .. index:: single: string; object representation @@ -656,9 +716,11 @@ Object Presentation ------------------- ---- a/Doc/library/_thread.rst -+++ b/Doc/library/_thread.rst -@@ -204,7 +204,7 @@ In addition to these methods, lock objec +Index: Python-3.10.17/Doc/library/_thread.rst +=================================================================== +--- Python-3.10.17.orig/Doc/library/_thread.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/library/_thread.rst 2025-04-11 10:08:04.188881316 +0200 +@@ -204,7 +204,7 @@ **Caveats:** @@ -667,8 +729,10 @@ * Threads interact strangely with interrupts: the :exc:`KeyboardInterrupt` exception will be received by an arbitrary thread. (When the :mod:`signal` ---- a/Doc/library/binascii.rst -+++ b/Doc/library/binascii.rst +Index: Python-3.10.17/Doc/library/binascii.rst +=================================================================== +--- Python-3.10.17.orig/Doc/library/binascii.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/library/binascii.rst 2025-04-11 10:08:04.189161382 +0200 @@ -6,9 +6,9 @@ representations. @@ -682,9 +746,11 @@ -------------- ---- a/Doc/library/cmath.rst -+++ b/Doc/library/cmath.rst -@@ -301,7 +301,7 @@ Constants +Index: Python-3.10.17/Doc/library/cmath.rst +=================================================================== +--- Python-3.10.17.orig/Doc/library/cmath.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/library/cmath.rst 2025-04-11 10:08:04.189381732 +0200 +@@ -301,7 +301,7 @@ .. versionadded:: 3.6 @@ -693,9 +759,11 @@ Note that the selection of functions is similar, but not identical, to that in module :mod:`math`. The reason for having two modules is that some users aren't ---- a/Doc/library/copy.rst -+++ b/Doc/library/copy.rst -@@ -68,7 +68,7 @@ Shallow copies of dictionaries can be ma +Index: Python-3.10.17/Doc/library/copy.rst +=================================================================== +--- Python-3.10.17.orig/Doc/library/copy.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/library/copy.rst 2025-04-11 10:08:04.189627156 +0200 +@@ -68,7 +68,7 @@ of lists by assigning a slice of the entire list, for example, ``copied_list = original_list[:]``. @@ -704,8 +772,10 @@ Classes can use the same interfaces to control copying that they use to control pickling. See the description of module :mod:`pickle` for information on these ---- a/Doc/library/copyreg.rst -+++ b/Doc/library/copyreg.rst +Index: Python-3.10.17/Doc/library/copyreg.rst +=================================================================== +--- Python-3.10.17.orig/Doc/library/copyreg.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/library/copyreg.rst 2025-04-11 10:08:04.189844155 +0200 @@ -7,8 +7,8 @@ **Source code:** :source:`Lib/copyreg.py` @@ -717,9 +787,11 @@ -------------- ---- a/Doc/library/dis.rst -+++ b/Doc/library/dis.rst -@@ -1207,7 +1207,7 @@ All of the following opcodes use their a +Index: Python-3.10.17/Doc/library/dis.rst +=================================================================== +--- Python-3.10.17.orig/Doc/library/dis.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/library/dis.rst 2025-04-11 10:08:04.190046067 +0200 +@@ -1207,7 +1207,7 @@ .. opcode:: BUILD_SLICE (argc) @@ -728,8 +800,10 @@ Pushes a slice object on the stack. *argc* must be 2 or 3. If it is 2, ``slice(TOS1, TOS)`` is pushed; if it is 3, ``slice(TOS2, TOS1, TOS)`` is ---- a/Doc/library/email.compat32-message.rst -+++ b/Doc/library/email.compat32-message.rst +Index: Python-3.10.17/Doc/library/email.compat32-message.rst +=================================================================== +--- Python-3.10.17.orig/Doc/library/email.compat32-message.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/library/email.compat32-message.rst 2025-04-11 10:08:04.190347504 +0200 @@ -7,6 +7,7 @@ :synopsis: The base class representing email messages in a fashion backward compatible with Python 3.2 @@ -738,9 +812,11 @@ The :class:`Message` class is very similar to the ---- a/Doc/library/exceptions.rst -+++ b/Doc/library/exceptions.rst -@@ -4,8 +4,8 @@ Built-in Exceptions +Index: Python-3.10.17/Doc/library/exceptions.rst +=================================================================== +--- Python-3.10.17.orig/Doc/library/exceptions.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/library/exceptions.rst 2025-04-11 10:08:04.190619678 +0200 +@@ -4,8 +4,8 @@ =================== .. index:: @@ -751,7 +827,7 @@ In Python, all exceptions must be instances of a class that derives from :class:`BaseException`. In a :keyword:`try` statement with an :keyword:`except` -@@ -14,7 +14,7 @@ classes derived from that class (but not +@@ -14,7 +14,7 @@ derived). Two exception classes that are not related via subclassing are never equivalent, even if they have the same name. @@ -760,7 +836,7 @@ The built-in exceptions listed below can be generated by the interpreter or built-in functions. Except where mentioned, they have an "associated value" -@@ -160,7 +160,7 @@ The following exceptions are the excepti +@@ -160,7 +160,7 @@ .. exception:: AssertionError @@ -769,7 +845,7 @@ Raised when an :keyword:`assert` statement fails. -@@ -303,7 +303,7 @@ The following exceptions are the excepti +@@ -303,7 +303,7 @@ .. exception:: OSError([arg]) OSError(errno, strerror[, filename[, winerror[, filename2]]]) @@ -778,8 +854,10 @@ This exception is raised when a system function returns a system-related error, including I/O failures such as "file not found" or "disk full" ---- a/Doc/library/fnmatch.rst -+++ b/Doc/library/fnmatch.rst +Index: Python-3.10.17/Doc/library/fnmatch.rst +=================================================================== +--- Python-3.10.17.orig/Doc/library/fnmatch.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/library/fnmatch.rst 2025-04-11 10:08:04.190902537 +0200 @@ -8,7 +8,7 @@ .. index:: single: filenames; wildcard expansion @@ -789,7 +867,7 @@ -------------- -@@ -38,7 +38,7 @@ special characters used in shell-style w +@@ -38,7 +38,7 @@ For a literal match, wrap the meta-characters in brackets. For example, ``'[?]'`` matches the character ``'?'``. @@ -798,9 +876,11 @@ Note that the filename separator (``'/'`` on Unix) is *not* special to this module. See module :mod:`glob` for pathname expansion (:mod:`glob` uses ---- a/Doc/library/functions.rst -+++ b/Doc/library/functions.rst -@@ -548,7 +548,7 @@ are always available. They are listed h +Index: Python-3.10.17/Doc/library/functions.rst +=================================================================== +--- Python-3.10.17.orig/Doc/library/functions.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/library/functions.rst 2025-04-11 10:08:04.191129174 +0200 +@@ -548,7 +548,7 @@ Raises an :ref:`auditing event ` ``exec`` with the code object as the argument. Code compilation events may also be raised. @@ -809,7 +889,7 @@ .. function:: exec(object[, globals[, locals]]) -@@ -1314,7 +1314,7 @@ are always available. They are listed h +@@ -1314,7 +1314,7 @@ single: I/O control; buffering single: binary mode single: text mode @@ -818,7 +898,7 @@ See also the file handling modules, such as :mod:`fileinput`, :mod:`io` (where :func:`open` is declared), :mod:`os`, :mod:`os.path`, :mod:`tempfile`, -@@ -1799,7 +1799,7 @@ are always available. They are listed h +@@ -1799,7 +1799,7 @@ .. class:: type(object) type(name, bases, dict, **kwds) @@ -827,7 +907,7 @@ With one argument, return the type of an *object*. The return value is a type object and generally the same object as returned by -@@ -1954,8 +1954,8 @@ are always available. They are listed h +@@ -1954,8 +1954,8 @@ .. function:: __import__(name, globals=None, locals=None, fromlist=(), level=0) .. index:: @@ -838,8 +918,10 @@ .. note:: ---- a/Doc/library/http.client.rst -+++ b/Doc/library/http.client.rst +Index: Python-3.10.17/Doc/library/http.client.rst +=================================================================== +--- Python-3.10.17.orig/Doc/library/http.client.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/library/http.client.rst 2025-04-11 10:08:04.191542148 +0200 @@ -10,7 +10,7 @@ pair: HTTP; protocol single: HTTP; http.client (standard module) @@ -849,8 +931,10 @@ -------------- ---- a/Doc/library/imp.rst -+++ b/Doc/library/imp.rst +Index: Python-3.10.17/Doc/library/imp.rst +=================================================================== +--- Python-3.10.17.orig/Doc/library/imp.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/library/imp.rst 2025-04-11 10:08:04.191775280 +0200 @@ -10,7 +10,7 @@ .. deprecated:: 3.4 The :mod:`imp` module is deprecated in favor of :mod:`importlib`. @@ -860,9 +944,11 @@ -------------- ---- a/Doc/library/internet.rst -+++ b/Doc/library/internet.rst -@@ -9,7 +9,7 @@ Internet Protocols and Support +Index: Python-3.10.17/Doc/library/internet.rst +=================================================================== +--- Python-3.10.17.orig/Doc/library/internet.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/library/internet.rst 2025-04-11 10:08:04.192005409 +0200 +@@ -9,7 +9,7 @@ single: Internet single: World Wide Web @@ -871,9 +957,11 @@ The modules described in this chapter implement internet protocols and support for related technology. They are all implemented in Python. Most of these ---- a/Doc/library/locale.rst -+++ b/Doc/library/locale.rst -@@ -16,7 +16,7 @@ functionality. The POSIX locale mechanis +Index: Python-3.10.17/Doc/library/locale.rst +=================================================================== +--- Python-3.10.17.orig/Doc/library/locale.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/library/locale.rst 2025-04-11 10:08:04.192203340 +0200 +@@ -16,7 +16,7 @@ certain cultural issues in an application, without requiring the programmer to know all the specifics of each country where the software is executed. @@ -882,7 +970,7 @@ The :mod:`locale` module is implemented on top of the :mod:`_locale` module, which in turn uses an ANSI C locale implementation if available. -@@ -452,7 +452,7 @@ The :mod:`locale` module defines the fol +@@ -452,7 +452,7 @@ .. data:: LC_CTYPE @@ -891,9 +979,11 @@ Locale category for the character type functions. Depending on the settings of this category, the functions of module :mod:`string` dealing with case change ---- a/Doc/library/marshal.rst -+++ b/Doc/library/marshal.rst -@@ -15,8 +15,8 @@ undocumented on purpose; it may change b +Index: Python-3.10.17/Doc/library/marshal.rst +=================================================================== +--- Python-3.10.17.orig/Doc/library/marshal.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/library/marshal.rst 2025-04-11 10:08:04.192432840 +0200 +@@ -15,8 +15,8 @@ rarely does). [#]_ .. index:: @@ -904,9 +994,11 @@ This is not a general "persistence" module. For general persistence and transfer of Python objects through RPC calls, see the modules :mod:`pickle` and ---- a/Doc/library/os.path.rst -+++ b/Doc/library/os.path.rst -@@ -159,7 +159,7 @@ the :mod:`glob` module.) +Index: Python-3.10.17/Doc/library/os.path.rst +=================================================================== +--- Python-3.10.17.orig/Doc/library/os.path.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/library/os.path.rst 2025-04-11 10:08:04.192621134 +0200 +@@ -159,7 +159,7 @@ On Unix and Windows, return the argument with an initial component of ``~`` or ``~user`` replaced by that *user*'s home directory. @@ -915,9 +1007,11 @@ On Unix, an initial ``~`` is replaced by the environment variable :envvar:`HOME` if it is set; otherwise the current user's home directory is looked up in the ---- a/Doc/library/os.rst -+++ b/Doc/library/os.rst -@@ -1136,7 +1136,7 @@ or `the MSDN ` sequence operations, along with the additional methods described below. -@@ -2422,10 +2422,10 @@ Binary Sequence Types --- :class:`bytes` +@@ -2422,10 +2422,10 @@ ================================================================================= .. index:: @@ -1367,7 +1481,7 @@ The core built-in types for manipulating binary data are :class:`bytes` and :class:`bytearray`. They are supported by :class:`memoryview` which uses -@@ -2440,7 +2440,7 @@ The :mod:`array` module supports efficie +@@ -2440,7 +2440,7 @@ Bytes Objects ------------- @@ -1376,7 +1490,7 @@ Bytes objects are immutable sequences of single bytes. Since many major binary protocols are based on the ASCII text encoding, bytes objects offer -@@ -2547,7 +2547,7 @@ always convert a bytes object into a lis +@@ -2547,7 +2547,7 @@ Bytearray Objects ----------------- @@ -1385,7 +1499,7 @@ :class:`bytearray` objects are a mutable counterpart to :class:`bytes` objects. -@@ -4123,7 +4123,7 @@ copying. +@@ -4123,7 +4123,7 @@ Set Types --- :class:`set`, :class:`frozenset` ============================================== @@ -1394,7 +1508,7 @@ A :dfn:`set` object is an unordered collection of distinct :term:`hashable` objects. Common uses include membership testing, removing duplicates from a sequence, and -@@ -4325,12 +4325,12 @@ Mapping Types --- :class:`dict` +@@ -4325,12 +4325,12 @@ =============================== .. index:: @@ -1411,7 +1525,7 @@ A :term:`mapping` object maps :term:`hashable` values to arbitrary objects. Mappings are mutable objects. There is currently only one standard mapping -@@ -4794,7 +4794,7 @@ Generic Alias Type +@@ -4794,7 +4794,7 @@ ------------------ .. index:: @@ -1420,7 +1534,7 @@ pair: Generic; Alias ``GenericAlias`` objects are generally created by -@@ -5040,7 +5040,7 @@ Union Type +@@ -5040,7 +5040,7 @@ ---------- .. index:: @@ -1429,7 +1543,7 @@ pair: union; type A union object holds the value of the ``|`` (bitwise or) operation on -@@ -5197,7 +5197,7 @@ See :ref:`function` for more information +@@ -5197,7 +5197,7 @@ Methods ------- @@ -1438,7 +1552,7 @@ Methods are functions that are called using the attribute notation. There are two flavors: built-in methods (such as :meth:`append` on lists) and class -@@ -5244,7 +5244,7 @@ Code Objects +@@ -5244,7 +5244,7 @@ ------------ .. index:: @@ -1447,7 +1561,7 @@ single: __code__ (function object attribute) Code objects are used by the implementation to represent "pseudo-compiled" -@@ -5258,8 +5258,8 @@ Accessing ``__code__`` raises an :ref:`a +@@ -5258,8 +5258,8 @@ ``object.__getattr__`` with arguments ``obj`` and ``"__code__"``. .. index:: @@ -1458,7 +1572,7 @@ A code object can be executed or evaluated by passing it (instead of a source string) to the :func:`exec` or :func:`eval` built-in functions. -@@ -5273,8 +5273,8 @@ Type Objects +@@ -5273,8 +5273,8 @@ ------------ .. index:: @@ -1469,9 +1583,11 @@ Type objects represent the various object types. An object's type is accessed by the built-in function :func:`type`. There are no special operations on ---- a/Doc/library/sys.rst -+++ b/Doc/library/sys.rst -@@ -398,7 +398,7 @@ always available. +Index: Python-3.10.17/Doc/library/sys.rst +=================================================================== +--- Python-3.10.17.orig/Doc/library/sys.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/library/sys.rst 2025-04-11 10:08:04.197027382 +0200 +@@ -398,7 +398,7 @@ an except clause." For any stack frame, only information about the exception being currently handled is accessible. @@ -1480,9 +1596,11 @@ If no exception is being handled anywhere on the stack, a tuple containing three ``None`` values is returned. Otherwise, the values returned are ---- a/Doc/library/traceback.rst -+++ b/Doc/library/traceback.rst -@@ -14,7 +14,7 @@ interpreter when it prints a stack trace +Index: Python-3.10.17/Doc/library/traceback.rst +=================================================================== +--- Python-3.10.17.orig/Doc/library/traceback.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/library/traceback.rst 2025-04-11 10:08:04.197370305 +0200 +@@ -14,7 +14,7 @@ stack traces under program control, such as in a "wrapper" around the interpreter. @@ -1491,9 +1609,11 @@ The module uses traceback objects --- this is the object type that is stored in the :data:`sys.last_traceback` variable and returned as the third item from ---- a/Doc/library/types.rst -+++ b/Doc/library/types.rst -@@ -146,7 +146,7 @@ Standard names are defined for the follo +Index: Python-3.10.17/Doc/library/types.rst +=================================================================== +--- Python-3.10.17.orig/Doc/library/types.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/library/types.rst 2025-04-11 10:08:04.197625577 +0200 +@@ -146,7 +146,7 @@ .. class:: CodeType(**kwargs) @@ -1502,9 +1622,11 @@ The type for code objects such as returned by :func:`compile`. ---- a/Doc/reference/compound_stmts.rst -+++ b/Doc/reference/compound_stmts.rst -@@ -84,9 +84,9 @@ The :keyword:`!if` statement +Index: Python-3.10.17/Doc/reference/compound_stmts.rst +=================================================================== +--- Python-3.10.17.orig/Doc/reference/compound_stmts.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/reference/compound_stmts.rst 2025-04-11 10:08:04.197921706 +0200 +@@ -84,9 +84,9 @@ ============================ .. index:: @@ -1517,7 +1639,7 @@ single: : (colon); compound statement The :keyword:`if` statement is used for conditional execution: -@@ -109,8 +109,8 @@ The :keyword:`!while` statement +@@ -109,8 +109,8 @@ =============================== .. index:: @@ -1528,7 +1650,7 @@ pair: loop; statement single: : (colon); compound statement -@@ -127,8 +127,8 @@ suite of the :keyword:`!else` clause, if +@@ -127,8 +127,8 @@ terminates. .. index:: @@ -1539,7 +1661,7 @@ A :keyword:`break` statement executed in the first suite terminates the loop without executing the :keyword:`!else` clause's suite. A :keyword:`continue` -@@ -142,12 +142,12 @@ The :keyword:`!for` statement +@@ -142,12 +142,12 @@ ============================= .. index:: @@ -1556,7 +1678,7 @@ single: : (colon); compound statement The :keyword:`for` statement is used to iterate over the elements of a sequence -@@ -167,8 +167,8 @@ is empty or an iterator raises a :exc:`S +@@ -167,8 +167,8 @@ the :keyword:`!else` clause, if present, is executed, and the loop terminates. .. index:: @@ -1567,7 +1689,7 @@ A :keyword:`break` statement executed in the first suite terminates the loop without executing the :keyword:`!else` clause's suite. A :keyword:`continue` -@@ -188,7 +188,7 @@ those made in the suite of the for-loop: +@@ -188,7 +188,7 @@ .. index:: @@ -1576,7 +1698,7 @@ Names in the target list are not deleted when the loop is finished, but if the sequence is empty, they will not have been assigned to at all by the loop. Hint: -@@ -204,11 +204,11 @@ The :keyword:`!try` statement +@@ -204,11 +204,11 @@ ============================= .. index:: @@ -1593,7 +1715,7 @@ single: : (colon); compound statement The :keyword:`try` statement specifies exception handlers and/or cleanup code -@@ -275,8 +275,8 @@ traceback attached to them, they form a +@@ -275,8 +275,8 @@ keeping all locals in that frame alive until the next garbage collection occurs. .. index:: @@ -1604,7 +1726,7 @@ Before an except clause's suite is executed, details about the exception are stored in the :mod:`sys` module and can be accessed via :func:`sys.exc_info`. -@@ -305,10 +305,10 @@ when leaving an exception handler:: +@@ -305,10 +305,10 @@ (None, None, None) .. index:: @@ -1619,7 +1741,7 @@ The optional :keyword:`!else` clause is executed if the control flow leaves the :keyword:`try` suite, no exception was raised, and no :keyword:`return`, -@@ -316,7 +316,7 @@ The optional :keyword:`!else` clause is +@@ -316,7 +316,7 @@ the :keyword:`!else` clause are not handled by the preceding :keyword:`except` clauses. @@ -1628,7 +1750,7 @@ If :keyword:`finally` is present, it specifies a 'cleanup' handler. The :keyword:`try` clause is executed, including any :keyword:`except` and -@@ -341,9 +341,9 @@ The exception information is not availab +@@ -341,9 +341,9 @@ the :keyword:`finally` clause. .. index:: @@ -1641,7 +1763,7 @@ When a :keyword:`return`, :keyword:`break` or :keyword:`continue` statement is executed in the :keyword:`try` suite of a :keyword:`!try`...\ :keyword:`!finally` -@@ -379,8 +379,8 @@ The :keyword:`!with` statement +@@ -379,8 +379,8 @@ ============================== .. index:: @@ -1652,7 +1774,7 @@ single: as; with statement single: , (comma); with statement single: : (colon); compound statement -@@ -496,11 +496,11 @@ The :keyword:`!match` statement +@@ -496,11 +496,11 @@ =============================== .. index:: @@ -1668,7 +1790,7 @@ pair: match; case single: as; match statement single: : (colon); compound statement -@@ -1101,12 +1101,12 @@ Function definitions +@@ -1101,12 +1101,12 @@ ==================== .. index:: @@ -1684,7 +1806,7 @@ pair: function; name pair: name; binding single: () (parentheses); function definition -@@ -1274,8 +1274,8 @@ Class definitions +@@ -1274,8 +1274,8 @@ ================= .. index:: @@ -1695,7 +1817,7 @@ pair: class; definition pair: class; name pair: name; binding -@@ -1374,7 +1374,7 @@ Coroutines +@@ -1374,7 +1374,7 @@ .. versionadded:: 3.5 @@ -1704,7 +1826,7 @@ .. _`async def`: Coroutine function definition -@@ -1385,8 +1385,8 @@ Coroutine function definition +@@ -1385,8 +1385,8 @@ : ["->" `expression`] ":" `suite` .. index:: @@ -1715,7 +1837,7 @@ Execution of Python coroutines can be suspended and resumed at many points (see :term:`coroutine`). :keyword:`await` expressions, :keyword:`async for` and -@@ -1408,7 +1408,7 @@ An example of a coroutine function:: +@@ -1408,7 +1408,7 @@ ``await`` and ``async`` are now keywords; previously they were only treated as such inside the body of a coroutine function. @@ -1724,7 +1846,7 @@ .. _`async for`: The :keyword:`!async for` statement -@@ -1453,7 +1453,7 @@ It is a :exc:`SyntaxError` to use an ``a +@@ -1453,7 +1453,7 @@ body of a coroutine function. @@ -1733,9 +1855,11 @@ .. _`async with`: The :keyword:`!async with` statement ---- a/Doc/reference/datamodel.rst -+++ b/Doc/reference/datamodel.rst -@@ -21,8 +21,8 @@ conformance to Von Neumann's model of a +Index: Python-3.10.17/Doc/reference/datamodel.rst +=================================================================== +--- Python-3.10.17.orig/Doc/reference/datamodel.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/reference/datamodel.rst 2025-04-11 10:08:04.198517037 +0200 +@@ -21,8 +21,8 @@ represented by objects.) .. index:: @@ -1746,7 +1870,7 @@ single: identity of an object single: value of an object single: type of an object -@@ -142,7 +142,7 @@ attributes.' These are attributes that +@@ -142,7 +142,7 @@ are not intended for general use. Their definition may change in the future. None @@ -1755,7 +1879,7 @@ This type has a single value. There is a single object with this value. This object is accessed through the built-in name ``None``. It is used to signify the -@@ -150,7 +150,7 @@ None +@@ -150,7 +150,7 @@ don't explicitly return anything. Its truth value is false. NotImplemented @@ -1764,7 +1888,7 @@ This type has a single value. There is a single object with this value. This object is accessed through the built-in name ``NotImplemented``. Numeric methods -@@ -171,7 +171,7 @@ NotImplemented +@@ -171,7 +171,7 @@ Ellipsis .. index:: @@ -1773,7 +1897,7 @@ single: ...; ellipsis literal This type has a single value. There is a single object with this value. This -@@ -179,7 +179,7 @@ Ellipsis +@@ -179,7 +179,7 @@ ``Ellipsis``. Its truth value is true. :class:`numbers.Number` @@ -1782,7 +1906,7 @@ These are created by numeric literals and returned as results by arithmetic operators and arithmetic built-in functions. Numeric objects are immutable; -@@ -209,7 +209,7 @@ Ellipsis +@@ -209,7 +209,7 @@ numbers: :class:`numbers.Integral` @@ -1791,7 +1915,7 @@ These represent elements from the mathematical set of integers (positive and negative). -@@ -225,7 +225,7 @@ Ellipsis +@@ -225,7 +225,7 @@ Booleans (:class:`bool`) .. index:: @@ -1800,7 +1924,7 @@ single: False single: True -@@ -242,7 +242,7 @@ Ellipsis +@@ -242,7 +242,7 @@ :class:`numbers.Real` (:class:`float`) .. index:: @@ -1809,7 +1933,7 @@ pair: floating point; number pair: C; language pair: Java; language -@@ -257,7 +257,7 @@ Ellipsis +@@ -257,7 +257,7 @@ :class:`numbers.Complex` (:class:`complex`) .. index:: @@ -1818,7 +1942,7 @@ pair: complex; number These represent complex numbers as a pair of machine-level double precision -@@ -267,8 +267,8 @@ Ellipsis +@@ -267,8 +267,8 @@ Sequences .. index:: @@ -1829,7 +1953,7 @@ single: index operation single: item selection single: subscription -@@ -293,8 +293,8 @@ Sequences +@@ -293,8 +293,8 @@ Immutable sequences .. index:: @@ -1840,7 +1964,7 @@ An object of an immutable sequence type cannot change once it is created. (If the object contains references to other objects, these other objects may be -@@ -308,8 +308,8 @@ Sequences +@@ -308,8 +308,8 @@ Strings .. index:: @@ -1851,7 +1975,7 @@ single: character single: integer single: Unicode -@@ -328,7 +328,7 @@ Sequences +@@ -328,7 +328,7 @@ Tuples .. index:: @@ -1860,7 +1984,7 @@ pair: singleton; tuple pair: empty; tuple -@@ -350,8 +350,8 @@ Sequences +@@ -350,8 +350,8 @@ Mutable sequences .. index:: @@ -1871,7 +1995,7 @@ pair: assignment; statement single: subscription single: slicing -@@ -363,7 +363,7 @@ Sequences +@@ -363,7 +363,7 @@ There are currently two intrinsic mutable sequence types: Lists @@ -1880,7 +2004,7 @@ The items of a list are arbitrary Python objects. Lists are formed by placing a comma-separated list of expressions in square brackets. (Note -@@ -377,15 +377,15 @@ Sequences +@@ -377,15 +377,15 @@ (and hence unhashable), byte arrays otherwise provide the same interface and functionality as immutable :class:`bytes` objects. @@ -1899,7 +2023,7 @@ These represent unordered, finite sets of unique, immutable objects. As such, they cannot be indexed by any subscript. However, they can be iterated over, and -@@ -402,14 +402,14 @@ Set types +@@ -402,14 +402,14 @@ There are currently two intrinsic set types: Sets @@ -1916,7 +2040,7 @@ These represent an immutable set. They are created by the built-in :func:`frozenset` constructor. As a frozenset is immutable and -@@ -418,9 +418,9 @@ Set types +@@ -418,9 +418,9 @@ Mappings .. index:: @@ -1928,7 +2052,7 @@ These represent finite sets of objects indexed by arbitrary index sets. The subscript notation ``a[k]`` selects the item indexed by ``k`` from the mapping -@@ -431,7 +431,7 @@ Mappings +@@ -431,7 +431,7 @@ There is currently a single intrinsic mapping type: Dictionaries @@ -1937,7 +2061,7 @@ These represent finite sets of objects indexed by nearly arbitrary values. The only types of values not acceptable as keys are values containing lists or -@@ -451,8 +451,8 @@ Mappings +@@ -451,8 +451,8 @@ section :ref:`dict`). .. index:: @@ -1948,7 +2072,7 @@ The extension modules :mod:`dbm.ndbm` and :mod:`dbm.gnu` provide additional examples of mapping types, as does the :mod:`collections` -@@ -465,7 +465,7 @@ Mappings +@@ -465,7 +465,7 @@ Callable types .. index:: @@ -1957,7 +2081,7 @@ pair: function; call single: invocation pair: function; argument -@@ -476,8 +476,8 @@ Callable types +@@ -476,8 +476,8 @@ User-defined functions .. index:: pair: user-defined; function @@ -1968,7 +2092,7 @@ A user-defined function object is created by a function definition (see section :ref:`function`). It should be called with an argument list -@@ -580,8 +580,8 @@ Callable types +@@ -580,8 +580,8 @@ Instance methods .. index:: @@ -1979,7 +2103,7 @@ pair: user-defined; method An instance method object combines a class, a class instance and any -@@ -688,8 +688,8 @@ Callable types +@@ -688,8 +688,8 @@ Built-in functions .. index:: @@ -1990,7 +2114,7 @@ pair: C; language A built-in function object is a wrapper around a C function. Examples of -@@ -703,8 +703,8 @@ Callable types +@@ -703,8 +703,8 @@ Built-in methods .. index:: @@ -2001,7 +2125,7 @@ pair: built-in; method This is really a different disguise of a built-in function, this time containing -@@ -727,8 +727,8 @@ Callable types +@@ -727,8 +727,8 @@ Modules .. index:: @@ -2012,7 +2136,7 @@ Modules are a basic organizational unit of Python code, and are created by the :ref:`import system ` as invoked either by the -@@ -805,12 +805,12 @@ Custom classes +@@ -805,12 +805,12 @@ .. XXX: Could we add that MRO doc as an appendix to the language ref? .. index:: @@ -2029,7 +2153,7 @@ pair: class; attribute When a class attribute reference (for class :class:`C`, say) would yield a -@@ -865,8 +865,8 @@ Custom classes +@@ -865,8 +865,8 @@ Class instances .. index:: @@ -2040,7 +2164,7 @@ pair: class; instance pair: class instance; attribute -@@ -892,9 +892,9 @@ Class instances +@@ -892,9 +892,9 @@ dictionary directly. .. index:: @@ -2053,7 +2177,7 @@ Class instances can pretend to be numbers, sequences, or mappings if they have methods with certain special names. See section :ref:`specialnames`. -@@ -908,8 +908,8 @@ Class instances +@@ -908,8 +908,8 @@ I/O objects (also known as file objects) .. index:: @@ -2064,7 +2188,7 @@ single: popen() (in module os) single: makefile() (socket method) single: sys.stdin -@@ -993,7 +993,7 @@ Internal types +@@ -993,7 +993,7 @@ required stack size; :attr:`co_flags` is an integer encoding a number of flags for the interpreter. @@ -2073,7 +2197,7 @@ The following flag bits are defined for :attr:`co_flags`: bit ``0x04`` is set if the function uses the ``*arguments`` syntax to accept an arbitrary number of -@@ -1017,7 +1017,7 @@ Internal types +@@ -1017,7 +1017,7 @@ .. _frame-objects: Frame objects @@ -2082,7 +2206,7 @@ Frame objects represent execution frames. They may occur in traceback objects (see below), and are also passed to registered trace functions. -@@ -1080,7 +1080,7 @@ Internal types +@@ -1080,7 +1080,7 @@ Traceback objects .. index:: @@ -2091,7 +2215,7 @@ pair: stack; trace pair: exception; handler pair: execution; stack -@@ -1114,7 +1114,7 @@ Internal types +@@ -1114,7 +1114,7 @@ single: tb_frame (traceback attribute) single: tb_lineno (traceback attribute) single: tb_lasti (traceback attribute) @@ -2100,7 +2224,7 @@ Special read-only attributes: :attr:`tb_frame` points to the execution frame of the current level; -@@ -1140,7 +1140,7 @@ Internal types +@@ -1140,7 +1140,7 @@ and the ``tb_next`` attribute of existing instances can be updated. Slice objects @@ -2109,7 +2233,7 @@ Slice objects are used to represent slices for :meth:`~object.__getitem__` -@@ -1273,7 +1273,7 @@ Basic customization +@@ -1273,7 +1273,7 @@ .. index:: single: destructor single: finalizer @@ -2118,7 +2242,7 @@ Called when the instance is about to be destroyed. This is also called a finalizer or (improperly) a destructor. If a base class has a -@@ -1374,7 +1374,7 @@ Basic customization +@@ -1374,7 +1374,7 @@ .. method:: object.__bytes__(self) @@ -2127,7 +2251,7 @@ Called by :ref:`bytes ` to compute a byte-string representation of an object. This should return a :class:`bytes` object. -@@ -1382,7 +1382,7 @@ Basic customization +@@ -1382,7 +1382,7 @@ .. index:: single: string; __format__() (object method) pair: string; conversion @@ -2136,7 +2260,7 @@ .. method:: object.__format__(self, format_spec) -@@ -1461,8 +1461,8 @@ Basic customization +@@ -1461,8 +1461,8 @@ .. method:: object.__hash__(self) .. index:: @@ -2147,7 +2271,7 @@ Called by built-in function :func:`hash` and for operations on members of hashed collections including :class:`set`, :class:`frozenset`, and -@@ -1981,7 +1981,7 @@ Metaclasses +@@ -1981,7 +1981,7 @@ .. index:: single: metaclass @@ -2156,7 +2280,7 @@ single: = (equals); class definition By default, classes are constructed using :func:`type`. The class body is -@@ -2395,7 +2395,7 @@ through the object's keys; for sequences +@@ -2395,7 +2395,7 @@ .. method:: object.__len__(self) .. index:: @@ -2165,7 +2289,7 @@ single: __bool__() (object method) Called to implement the built-in function :func:`len`. Should return the length -@@ -2424,7 +2424,7 @@ through the object's keys; for sequences +@@ -2424,7 +2424,7 @@ .. versionadded:: 3.4 @@ -2174,7 +2298,7 @@ .. note:: -@@ -2553,9 +2553,9 @@ left undefined. +@@ -2553,9 +2553,9 @@ object.__or__(self, other) .. index:: @@ -2187,7 +2311,7 @@ These methods are called to implement the binary arithmetic operations (``+``, ``-``, ``*``, ``@``, ``/``, ``//``, ``%``, :func:`divmod`, -@@ -2588,8 +2588,8 @@ left undefined. +@@ -2588,8 +2588,8 @@ object.__ror__(self, other) .. index:: @@ -2198,7 +2322,7 @@ These methods are called to implement the binary arithmetic operations (``+``, ``-``, ``*``, ``@``, ``/``, ``//``, ``%``, :func:`divmod`, -@@ -2600,7 +2600,7 @@ left undefined. +@@ -2600,7 +2600,7 @@ an instance of a class that has an :meth:`__rsub__` method, ``y.__rsub__(x)`` is called if ``x.__sub__(y)`` returns *NotImplemented*. @@ -2207,7 +2331,7 @@ Note that ternary :func:`pow` will not try calling :meth:`__rpow__` (the coercion rules would become too complicated). -@@ -2647,7 +2647,7 @@ left undefined. +@@ -2647,7 +2647,7 @@ object.__abs__(self) object.__invert__(self) @@ -2216,7 +2340,7 @@ Called to implement the unary arithmetic operations (``-``, ``+``, :func:`abs` and ``~``). -@@ -2658,9 +2658,9 @@ left undefined. +@@ -2658,9 +2658,9 @@ object.__float__(self) .. index:: @@ -2229,7 +2353,7 @@ Called to implement the built-in functions :func:`complex`, :func:`int` and :func:`float`. Should return a value -@@ -2685,7 +2685,7 @@ left undefined. +@@ -2685,7 +2685,7 @@ object.__floor__(self) object.__ceil__(self) @@ -2238,7 +2362,7 @@ Called to implement the built-in function :func:`round` and :mod:`math` functions :func:`~math.trunc`, :func:`~math.floor` and :func:`~math.ceil`. -@@ -2710,7 +2710,7 @@ execution of the block of code. Context +@@ -2710,7 +2710,7 @@ used by directly invoking their methods. .. index:: @@ -2247,9 +2371,11 @@ single: context manager Typical uses of context managers include saving and restoring various kinds of ---- a/Doc/reference/executionmodel.rst -+++ b/Doc/reference/executionmodel.rst -@@ -151,7 +151,7 @@ to previously bound variables in the nea +Index: Python-3.10.17/Doc/reference/executionmodel.rst +=================================================================== +--- Python-3.10.17.orig/Doc/reference/executionmodel.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/reference/executionmodel.rst 2025-04-11 10:08:04.198995733 +0200 +@@ -151,7 +151,7 @@ :exc:`SyntaxError` is raised at compile time if the given name does not exist in any enclosing function scope. @@ -2258,9 +2384,11 @@ The namespace for a module is automatically created the first time a module is imported. The main module for a script is always called :mod:`__main__`. ---- a/Doc/reference/expressions.rst -+++ b/Doc/reference/expressions.rst -@@ -71,7 +71,7 @@ An identifier occurring as an atom is a +Index: Python-3.10.17/Doc/reference/expressions.rst +=================================================================== +--- Python-3.10.17.orig/Doc/reference/expressions.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/reference/expressions.rst 2025-04-11 10:08:04.199232427 +0200 +@@ -71,7 +71,7 @@ for lexical definition and section :ref:`naming` for documentation of naming and binding. @@ -2269,7 +2397,7 @@ When the name is bound to an object, evaluation of the atom yields that object. When a name is not bound, an attempt to evaluate it raises a :exc:`NameError` -@@ -240,7 +240,7 @@ List displays +@@ -240,7 +240,7 @@ pair: list; display pair: list; comprehensions pair: empty; list @@ -2278,7 +2406,7 @@ single: [] (square brackets); list expression single: , (comma); expression list -@@ -265,7 +265,7 @@ Set displays +@@ -265,7 +265,7 @@ .. index:: pair: set; display pair: set; comprehensions @@ -2287,7 +2415,7 @@ single: {} (curly brackets); set expression single: , (comma); expression list -@@ -294,7 +294,7 @@ Dictionary displays +@@ -294,7 +294,7 @@ pair: dictionary; display pair: dictionary; comprehensions key, datum, key/datum pair @@ -2296,7 +2424,7 @@ single: {} (curly brackets); dictionary expression single: : (colon); in dictionary expressions single: , (comma); in dictionary displays -@@ -356,7 +356,7 @@ Generator expressions +@@ -356,7 +356,7 @@ .. index:: pair: generator; expression @@ -2305,7 +2433,7 @@ single: () (parentheses); generator expression A generator expression is a compact generator notation in parentheses: -@@ -410,8 +410,8 @@ Yield expressions +@@ -410,8 +410,8 @@ ----------------- .. index:: @@ -2316,7 +2444,7 @@ pair: yield; expression pair: generator; function -@@ -517,7 +517,7 @@ on the right hand side of an assignment +@@ -517,7 +517,7 @@ The proposal that expanded on :pep:`492` by adding generator capabilities to coroutine functions. @@ -2325,7 +2453,7 @@ .. _generator-methods: Generator-iterator methods -@@ -529,7 +529,7 @@ be used to control the execution of a ge +@@ -529,7 +529,7 @@ Note that calling any of the generator methods below when the generator is already executing raises a :exc:`ValueError` exception. @@ -2334,7 +2462,7 @@ .. method:: generator.__next__() -@@ -579,7 +579,7 @@ is already executing raises a :exc:`Valu +@@ -579,7 +579,7 @@ :attr:`~BaseException.__traceback__` attribute stored in *value* may be cleared. @@ -2343,7 +2471,7 @@ .. method:: generator.close() -@@ -691,7 +691,7 @@ of a *finalizer* method see the implemen +@@ -691,7 +691,7 @@ The expression ``yield from `` is a syntax error when used in an asynchronous generator function. @@ -2352,7 +2480,7 @@ .. _asynchronous-generator-methods: Asynchronous generator-iterator methods -@@ -701,7 +701,7 @@ This subsection describes the methods of +@@ -701,7 +701,7 @@ which are used to control the execution of a generator function. @@ -2361,7 +2489,7 @@ .. coroutinemethod:: agen.__anext__() -@@ -748,7 +748,7 @@ which are used to control the execution +@@ -748,7 +748,7 @@ raises a different exception, then when the awaitable is run that exception propagates to the caller of the awaitable. @@ -2370,7 +2498,7 @@ .. coroutinemethod:: agen.aclose() -@@ -795,9 +795,9 @@ An attribute reference is a primary foll +@@ -795,9 +795,9 @@ attributeref: `primary` "." `identifier` .. index:: @@ -2383,7 +2511,7 @@ The primary must evaluate to an object of a type that supports attribute references, which most objects do. This object is then asked to produce the -@@ -818,12 +818,12 @@ Subscriptions +@@ -818,12 +818,12 @@ single: [] (square brackets); subscription .. index:: @@ -2402,7 +2530,7 @@ pair: sequence; item The subscription of an instance of a :ref:`container class ` -@@ -891,10 +891,10 @@ Slicings +@@ -891,10 +891,10 @@ single: , (comma); slicing .. index:: @@ -2417,7 +2545,7 @@ A slicing selects a range of items in a sequence object (e.g., a string, tuple or list). Slicings may be used as expressions or as targets in assignment or -@@ -935,7 +935,7 @@ substituting ``None`` for missing expres +@@ -935,7 +935,7 @@ .. index:: @@ -2426,7 +2554,7 @@ single: call single: argument; call semantics single: () (parentheses); call -@@ -1085,8 +1085,8 @@ a user-defined function: +@@ -1085,8 +1085,8 @@ .. index:: pair: function; call triple: user-defined; function; call @@ -2437,7 +2565,7 @@ The code block for the function is executed, passing it the argument list. The first thing the code block will do is bind the formal parameters to the -@@ -1100,25 +1100,25 @@ a built-in function or method: +@@ -1100,25 +1100,25 @@ pair: built-in function; call pair: method; call pair: built-in method; call @@ -2470,7 +2598,7 @@ pair: class instance; call The corresponding user-defined function is called, with an argument list that is -@@ -1134,7 +1134,7 @@ a class instance: +@@ -1134,7 +1134,7 @@ if that method was called. @@ -2479,7 +2607,7 @@ .. _await: Await expression -@@ -1156,7 +1156,7 @@ The power operator +@@ -1156,7 +1156,7 @@ .. index:: pair: power; operation @@ -2488,7 +2616,7 @@ The power operator binds more tightly than unary operators on its left; it binds less tightly than unary operators on its right. The syntax is: -@@ -1217,7 +1217,7 @@ operation can be overridden with the :me +@@ -1217,7 +1217,7 @@ .. index:: single: inversion @@ -2497,7 +2625,7 @@ The unary ``~`` (invert) operator yields the bitwise inversion of its integer argument. The bitwise inversion of ``x`` is defined as ``-(x+1)``. It only -@@ -1226,7 +1226,7 @@ applies to integral numbers or to custom +@@ -1226,7 +1226,7 @@ @@ -2506,7 +2634,7 @@ In all three cases, if the argument does not have the proper type, a :exc:`TypeError` exception is raised. -@@ -1252,7 +1252,7 @@ operators and one for additive operators +@@ -1252,7 +1252,7 @@ .. index:: single: multiplication @@ -2515,7 +2643,7 @@ The ``*`` (multiplication) operator yields the product of its arguments. The arguments must either both be numbers, or one argument must be an integer and -@@ -1265,7 +1265,7 @@ This operation can be customized using t +@@ -1265,7 +1265,7 @@ .. index:: single: matrix multiplication @@ -2524,7 +2652,7 @@ The ``@`` (at) operator is intended to be used for matrix multiplication. No builtin Python types implement this operator. -@@ -1273,10 +1273,10 @@ builtin Python types implement this oper +@@ -1273,10 +1273,10 @@ .. versionadded:: 3.5 .. index:: @@ -2538,7 +2666,7 @@ The ``/`` (division) and ``//`` (floor division) operators yield the quotient of their arguments. The numeric arguments are first converted to a common type. -@@ -1290,7 +1290,7 @@ This operation can be customized using t +@@ -1290,7 +1290,7 @@ .. index:: single: modulo @@ -2547,7 +2675,7 @@ The ``%`` (modulo) operator yields the remainder from the division of the first argument by the second. The numeric arguments are first converted to a common -@@ -1348,8 +1348,8 @@ Shifting operations +@@ -1348,8 +1348,8 @@ .. index:: pair: shifting; operation @@ -2558,7 +2686,7 @@ The shifting operations have lower priority than the arithmetic operations: -@@ -1362,7 +1362,7 @@ the left or right by the number of bits +@@ -1362,7 +1362,7 @@ This operation can be customized using the special :meth:`__lshift__` and :meth:`__rshift__` methods. @@ -2567,7 +2695,7 @@ A right shift by *n* bits is defined as floor division by ``pow(2,n)``. A left shift by *n* bits is defined as multiplication with ``pow(2,n)``. -@@ -1384,7 +1384,7 @@ Each of the three bitwise operations has +@@ -1384,7 +1384,7 @@ .. index:: pair: bitwise; and @@ -2576,7 +2704,7 @@ The ``&`` operator yields the bitwise AND of its arguments, which must be integers or one of them must be a custom object overriding :meth:`__and__` or -@@ -1393,7 +1393,7 @@ integers or one of them must be a custom +@@ -1393,7 +1393,7 @@ .. index:: pair: bitwise; xor pair: exclusive; or @@ -2585,7 +2713,7 @@ The ``^`` operator yields the bitwise XOR (exclusive OR) of its arguments, which must be integers or one of them must be a custom object overriding :meth:`__xor__` or -@@ -1402,7 +1402,7 @@ must be integers or one of them must be +@@ -1402,7 +1402,7 @@ .. index:: pair: bitwise; or pair: inclusive; or @@ -2594,7 +2722,7 @@ The ``|`` operator yields the bitwise (inclusive) OR of its arguments, which must be integers or one of them must be a custom object overriding :meth:`__or__` or -@@ -1417,12 +1417,12 @@ Comparisons +@@ -1417,12 +1417,12 @@ .. index:: single: comparison pair: C; language @@ -2613,7 +2741,7 @@ Unlike C, all comparison operations in Python have the same priority, which is lower than that of any arithmetic, shifting or bitwise operation. Also unlike -@@ -1652,17 +1652,17 @@ raises the :exc:`IndexError` exception. +@@ -1652,17 +1652,17 @@ if :keyword:`in` raised that exception). .. index:: @@ -2636,7 +2764,7 @@ pair: identity; test -@@ -1702,17 +1702,17 @@ control flow statements, the following v +@@ -1702,17 +1702,17 @@ other values are interpreted as true. User-defined objects can customize their truth value by providing a :meth:`__bool__` method. @@ -2657,7 +2785,7 @@ The expression ``x or y`` first evaluates *x*; if *x* is true, its value is returned; otherwise, *y* is evaluated and the resulting value is returned. -@@ -1837,7 +1837,7 @@ Expression lists +@@ -1837,7 +1837,7 @@ starred_expression: `expression` | (`starred_item` ",")* [`starred_item`] starred_item: `assignment_expression` | "*" `or_expr` @@ -2666,9 +2794,11 @@ Except when part of a list or set display, an expression list containing at least one comma yields a tuple. The length of ---- a/Doc/reference/simple_stmts.rst -+++ b/Doc/reference/simple_stmts.rst -@@ -53,8 +53,8 @@ An expression statement evaluates the ex +Index: Python-3.10.17/Doc/reference/simple_stmts.rst +=================================================================== +--- Python-3.10.17.orig/Doc/reference/simple_stmts.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/reference/simple_stmts.rst 2025-04-11 10:08:04.199684443 +0200 +@@ -53,8 +53,8 @@ expression). .. index:: @@ -2679,7 +2809,7 @@ pair: string; conversion single: output pair: standard; output -@@ -76,7 +76,7 @@ Assignment statements +@@ -76,7 +76,7 @@ pair: assignment; statement pair: binding; name pair: rebinding; name @@ -2688,7 +2818,7 @@ pair: attribute; assignment Assignment statements are used to (re)bind names to values and to modify -@@ -185,7 +185,7 @@ Assignment of an object to a single targ +@@ -185,7 +185,7 @@ .. index:: pair: subscription; assignment @@ -2697,7 +2827,7 @@ * If the target is a subscription: The primary expression in the reference is evaluated. It should yield either a mutable sequence object (such as a list) -@@ -193,8 +193,8 @@ Assignment of an object to a single targ +@@ -193,8 +193,8 @@ evaluated. .. index:: @@ -2708,7 +2838,7 @@ If the primary is a mutable sequence object (such as a list), the subscript must yield an integer. If it is negative, the sequence's length is added to -@@ -204,8 +204,8 @@ Assignment of an object to a single targ +@@ -204,8 +204,8 @@ raised (assignment to a subscripted sequence cannot add new items to a list). .. index:: @@ -2719,7 +2849,7 @@ If the primary is a mapping object (such as a dictionary), the subscript must have a type compatible with the mapping's key type, and the mapping is then -@@ -376,7 +376,7 @@ The :keyword:`!assert` statement +@@ -376,7 +376,7 @@ ================================ .. index:: @@ -2728,7 +2858,7 @@ pair: debugging; assertions single: , (comma); expression list -@@ -398,7 +398,7 @@ The extended form, ``assert expression1, +@@ -398,7 +398,7 @@ .. index:: single: __debug__ @@ -2737,7 +2867,7 @@ These equivalences assume that :const:`__debug__` and :exc:`AssertionError` refer to the built-in variables with those names. In the current implementation, the -@@ -419,7 +419,7 @@ The :keyword:`!pass` statement +@@ -419,7 +419,7 @@ ============================== .. index:: @@ -2746,7 +2876,7 @@ pair: null; operation pair: null; operation -@@ -441,7 +441,7 @@ The :keyword:`!del` statement +@@ -441,7 +441,7 @@ ============================= .. index:: @@ -2755,7 +2885,7 @@ pair: deletion; target triple: deletion; target; list -@@ -454,7 +454,7 @@ Rather than spelling it out in full deta +@@ -454,7 +454,7 @@ Deletion of a target list recursively deletes each target, from left to right. .. index:: @@ -2764,7 +2894,7 @@ pair: unbinding; name Deletion of a name removes the binding of that name from the local or global -@@ -480,7 +480,7 @@ The :keyword:`!return` statement +@@ -480,7 +480,7 @@ ================================ .. index:: @@ -2773,7 +2903,7 @@ pair: function; definition pair: class; definition -@@ -495,7 +495,7 @@ If an expression list is present, it is +@@ -495,7 +495,7 @@ :keyword:`return` leaves the current function call with the expression list (or ``None``) as return value. @@ -2782,7 +2912,7 @@ When :keyword:`return` passes control out of a :keyword:`try` statement with a :keyword:`finally` clause, that :keyword:`!finally` clause is executed before -@@ -517,11 +517,11 @@ The :keyword:`!yield` statement +@@ -517,11 +517,11 @@ =============================== .. index:: @@ -2796,7 +2926,7 @@ .. productionlist:: python-grammar yield_stmt: `yield_expression` -@@ -553,7 +553,7 @@ The :keyword:`!raise` statement +@@ -553,7 +553,7 @@ =============================== .. index:: @@ -2805,7 +2935,7 @@ single: exception pair: raising; exception single: __traceback__ (exception attribute) -@@ -574,7 +574,7 @@ instantiating the class with no argument +@@ -574,7 +574,7 @@ The :dfn:`type` of the exception is the exception instance's class, the :dfn:`value` is the instance itself. @@ -2814,7 +2944,7 @@ A traceback object is normally created automatically when an exception is raised and attached to it as the :attr:`__traceback__` attribute, which is writable. -@@ -661,9 +661,9 @@ The :keyword:`!break` statement +@@ -661,9 +661,9 @@ =============================== .. index:: @@ -2827,7 +2957,7 @@ pair: loop; statement .. productionlist:: python-grammar -@@ -673,7 +673,7 @@ The :keyword:`!break` statement +@@ -673,7 +673,7 @@ :keyword:`while` loop, but not nested in a function or class definition within that loop. @@ -2836,7 +2966,7 @@ pair: loop control; target It terminates the nearest enclosing loop, skipping the optional :keyword:`!else` -@@ -682,7 +682,7 @@ clause if the loop has one. +@@ -682,7 +682,7 @@ If a :keyword:`for` loop is terminated by :keyword:`break`, the loop control target keeps its current value. @@ -2845,7 +2975,7 @@ When :keyword:`break` passes control out of a :keyword:`try` statement with a :keyword:`finally` clause, that :keyword:`!finally` clause is executed before -@@ -695,11 +695,11 @@ The :keyword:`!continue` statement +@@ -695,11 +695,11 @@ ================================== .. index:: @@ -2861,7 +2991,7 @@ .. productionlist:: python-grammar continue_stmt: "continue" -@@ -720,12 +720,12 @@ The :keyword:`!import` statement +@@ -720,12 +720,12 @@ ================================ .. index:: @@ -2878,7 +3008,7 @@ single: , (comma); import statement .. productionlist:: python-grammar -@@ -936,7 +936,7 @@ The :keyword:`!global` statement +@@ -936,7 +936,7 @@ ================================ .. index:: @@ -2887,7 +3017,7 @@ triple: global; name; binding single: , (comma); identifier list -@@ -964,9 +964,9 @@ annotation. +@@ -964,9 +964,9 @@ them or silently change the meaning of the program. .. index:: @@ -2900,7 +3030,7 @@ **Programmer's note:** :keyword:`global` is a directive to the parser. It applies only to code parsed at the same time as the :keyword:`!global` statement. -@@ -982,7 +982,7 @@ call. The same applies to the :func:`ev +@@ -982,7 +982,7 @@ The :keyword:`!nonlocal` statement ================================== @@ -2909,9 +3039,11 @@ single: , (comma); identifier list .. productionlist:: python-grammar ---- a/Doc/reference/toplevel_components.rst -+++ b/Doc/reference/toplevel_components.rst -@@ -21,9 +21,9 @@ Complete Python programs +Index: Python-3.10.17/Doc/reference/toplevel_components.rst +=================================================================== +--- Python-3.10.17.orig/Doc/reference/toplevel_components.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/reference/toplevel_components.rst 2025-04-11 10:08:04.200022128 +0200 +@@ -21,9 +21,9 @@ .. index:: single: program .. index:: @@ -2924,7 +3056,7 @@ While a language specification need not prescribe how the language interpreter is invoked, it is useful to have a notion of a complete Python program. A -@@ -38,7 +38,7 @@ the next section. +@@ -38,7 +38,7 @@ .. index:: single: interactive mode @@ -2933,7 +3065,7 @@ The interpreter may also be invoked in interactive mode; in this case, it does not read and execute a complete program but reads and executes one statement -@@ -98,7 +98,7 @@ Expression input +@@ -98,7 +98,7 @@ ================ .. index:: single: input @@ -2942,9 +3074,11 @@ :func:`eval` is used for expression input. It ignores leading whitespace. The string argument to :func:`eval` must have the following form: ---- a/Doc/tools/extensions/pyspecific.py -+++ b/Doc/tools/extensions/pyspecific.py -@@ -623,6 +623,30 @@ def process_audit_events(app, doctree, f +Index: Python-3.10.17/Doc/tools/extensions/pyspecific.py +=================================================================== +--- Python-3.10.17.orig/Doc/tools/extensions/pyspecific.py 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/tools/extensions/pyspecific.py 2025-04-11 10:08:04.200327546 +0200 +@@ -644,6 +644,30 @@ node.replace_self(table) @@ -2975,7 +3109,7 @@ def setup(app): app.add_role('issue', issue_role) app.add_role('gh', gh_issue_role) -@@ -645,6 +669,7 @@ def setup(app): +@@ -670,6 +694,7 @@ app.add_directive_to_domain('py', 'awaitablemethod', PyAwaitableMethod) app.add_directive_to_domain('py', 'abstractmethod', PyAbstractMethod) app.add_directive('miscnews', MiscNews) @@ -2983,9 +3117,11 @@ app.connect('doctree-resolved', process_audit_events) app.connect('env-merge-info', audit_events_merge) app.connect('env-purge-doc', audit_events_purge) ---- a/Doc/tutorial/classes.rst -+++ b/Doc/tutorial/classes.rst -@@ -344,7 +344,7 @@ list objects have methods called append, +Index: Python-3.10.17/Doc/tutorial/classes.rst +=================================================================== +--- Python-3.10.17.orig/Doc/tutorial/classes.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/tutorial/classes.rst 2025-04-11 10:08:04.200702526 +0200 +@@ -344,7 +344,7 @@ However, in the following discussion, we'll use the term method exclusively to mean methods of class instance objects, unless explicitly stated otherwise.) @@ -2994,9 +3130,11 @@ Valid method names of an instance object depend on its class. By definition, all attributes of a class that are function objects define corresponding ---- a/Doc/tutorial/controlflow.rst -+++ b/Doc/tutorial/controlflow.rst -@@ -46,7 +46,7 @@ details see :ref:`tut-match`. +Index: Python-3.10.17/Doc/tutorial/controlflow.rst +=================================================================== +--- Python-3.10.17.orig/Doc/tutorial/controlflow.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/tutorial/controlflow.rst 2025-04-11 10:08:04.201028129 +0200 +@@ -46,7 +46,7 @@ ========================== .. index:: @@ -3005,9 +3143,11 @@ The :keyword:`for` statement in Python differs a bit from what you may be used to in C or Pascal. Rather than always iterating over an arithmetic progression ---- a/Doc/tutorial/inputoutput.rst -+++ b/Doc/tutorial/inputoutput.rst -@@ -285,8 +285,8 @@ Reading and Writing Files +Index: Python-3.10.17/Doc/tutorial/inputoutput.rst +=================================================================== +--- Python-3.10.17.orig/Doc/tutorial/inputoutput.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/tutorial/inputoutput.rst 2025-04-11 10:08:04.201284099 +0200 +@@ -285,8 +285,8 @@ ========================= .. index:: @@ -3018,7 +3158,7 @@ :func:`open` returns a :term:`file object`, and is most commonly used with two positional arguments and one keyword argument: -@@ -466,7 +466,7 @@ Reference for a complete guide to file o +@@ -466,7 +466,7 @@ Saving structured data with :mod:`json` --------------------------------------- @@ -3027,9 +3167,11 @@ Strings can easily be written to and read from a file. Numbers take a bit more effort, since the :meth:`read` method only returns strings, which will have to ---- a/Doc/tutorial/modules.rst -+++ b/Doc/tutorial/modules.rst -@@ -260,7 +260,7 @@ Some tips for experts: +Index: Python-3.10.17/Doc/tutorial/modules.rst +=================================================================== +--- Python-3.10.17.orig/Doc/tutorial/modules.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/tutorial/modules.rst 2025-04-11 10:08:04.201533574 +0200 +@@ -260,7 +260,7 @@ Standard Modules ================ @@ -3038,7 +3180,7 @@ Python comes with a library of standard modules, described in a separate document, the Python Library Reference ("Library Reference" hereafter). Some -@@ -341,7 +341,7 @@ Without arguments, :func:`dir` lists the +@@ -341,7 +341,7 @@ Note that it lists all types of names: variables, modules, functions, etc. @@ -3047,9 +3189,11 @@ :func:`dir` does not list the names of built-in functions and variables. If you want a list of those, they are defined in the standard module ---- a/Doc/tutorial/stdlib.rst -+++ b/Doc/tutorial/stdlib.rst -@@ -24,7 +24,7 @@ Be sure to use the ``import os`` style i +Index: Python-3.10.17/Doc/tutorial/stdlib.rst +=================================================================== +--- Python-3.10.17.orig/Doc/tutorial/stdlib.rst 2025-04-08 14:10:59.000000000 +0200 ++++ Python-3.10.17/Doc/tutorial/stdlib.rst 2025-04-11 10:08:04.201783118 +0200 +@@ -24,7 +24,7 @@ will keep :func:`os.open` from shadowing the built-in :func:`open` function which operates much differently. diff --git a/sphinx-802.patch b/sphinx-802.patch index c4600b7..5e41aba 100644 --- a/sphinx-802.patch +++ b/sphinx-802.patch @@ -2,9 +2,11 @@ Doc/tools/extensions/pyspecific.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---- a/Doc/tools/extensions/pyspecific.py -+++ b/Doc/tools/extensions/pyspecific.py -@@ -27,7 +27,13 @@ try: +Index: Python-3.10.17/Doc/tools/extensions/pyspecific.py +=================================================================== +--- Python-3.10.17.orig/Doc/tools/extensions/pyspecific.py 2025-04-11 10:08:04.200327546 +0200 ++++ Python-3.10.17/Doc/tools/extensions/pyspecific.py 2025-04-11 10:08:21.185064035 +0200 +@@ -28,7 +28,13 @@ except ImportError: from sphinx.environment import NoUri from sphinx.locale import _ as sphinx_gettext