downloads: cpython 3.10.9 -> 3.10.11, 3.11.1 -> 3.11.3

Due to upstream changes in 3.10 and 3.11, we had to patch the Windows
build logic.

Author: indygreg

cpython-windows/build.py

@@ -774,27 +774,31 @@ def hack_props(
         for line in fh:
             line = line.rstrip()
 
-            if b"<bz2Dir>" in line:
+            # The syntax of these lines changed in 3.10+. 3.10 backport commit
+            # 3139ea33ed84190e079d6ff4859baccdad778dae. Once we drop support for
+            # Python 3.9 we can pass these via properties instead of editing the
+            # properties file.
+            if b"<bz2Dir" in line:
                 line = b"<bz2Dir>%s\\</bz2Dir>" % bzip2_path
 
-            elif b"<libffiOutDir>" in line:
+            elif b"<libffiOutDir" in line:
                 line = b"<libffiOutDir>%s\\</libffiOutDir>" % libffi_path
 
-            elif b"<lzmaDir>" in line:
+            elif b"<lzmaDir" in line:
                 line = b"<lzmaDir>%s\\</lzmaDir>" % xz_path
 
-            elif b"<opensslIncludeDir>" in line:
+            elif b"<opensslIncludeDir" in line:
                 line = (
                     b"<opensslIncludeDir>%s</opensslIncludeDir>" % openssl_include_path
                 )
 
-            elif b"<opensslOutDir>" in line:
+            elif b"<opensslOutDir" in line:
                 line = b"<opensslOutDir>%s\\</opensslOutDir>" % openssl_libs_path
 
-            elif b"<sqlite3Dir>" in line:
+            elif b"<sqlite3Dir" in line:
                 line = b"<sqlite3Dir>%s\\</sqlite3Dir>" % sqlite_path
 
-            elif b"<zlibDir>" in line:
+            elif b"<zlibDir" in line:
                 line = b"<zlibDir>%s\\</zlibDir>" % zlib_path
 
             lines.append(line)
@@ -804,11 +808,21 @@ def hack_props(
 
     tcltkprops_path = pcbuild_path / "tcltk.props"
 
-    static_replace_in_file(
-        tcltkprops_path,
-        rb"<tcltkDir>$(ExternalsDir)tcltk-$(TclMajorVersion).$(TclMinorVersion).$(TclPatchLevel).$(TclRevision)\$(ArchName)\</tcltkDir>",
-        rb"<tcltkDir>%s\$(ArchName)\</tcltkDir>" % tcltk_path,
-    )
+    # Later versions of 3.10 and 3.11 enabled support for defining paths via properties.
+    # See CPython commit 3139ea33ed84190e079d6ff4859baccdad778dae.
+    # Once we drop support for CPython 3.9 we can replace this with passing properties.
+    try:
+        static_replace_in_file(
+            tcltkprops_path,
+            rb"""<tcltkDir Condition="$(tcltkDir) == ''">$(ExternalsDir)tcltk-$(TclVersion)\$(ArchName)\</tcltkDir>""",
+            rb"<tcltkDir>%s\$(ArchName)\</tcltkDir>" % tcltk_path,
+        )
+    except NoSearchStringError:
+        static_replace_in_file(
+            tcltkprops_path,
+            rb"<tcltkDir>$(ExternalsDir)tcltk-$(TclMajorVersion).$(TclMinorVersion).$(TclPatchLevel).$(TclRevision)\$(ArchName)\</tcltkDir>",
+            rb"<tcltkDir>%s\$(ArchName)\</tcltkDir>" % tcltk_path,
+        )
 
     # We want to statically link against OpenSSL. This requires using our own
     # OpenSSL build. This requires some hacking of various files.

pythonbuild/downloads.py

@@ -53,19 +53,19 @@
         "python_tag": "cp39",
     },
     "cpython-3.10": {
-        "url": "https://www.python.org/ftp/python/3.10.9/Python-3.10.9.tar.xz",
-        "size": 19612112,
-        "sha256": "5ae03e308260164baba39921fdb4dbf8e6d03d8235a939d4582b33f0b5e46a83",
-        "version": "3.10.9",
+        "url": "https://www.python.org/ftp/python/3.10.11/Python-3.10.11.tar.xz",
+        "size": 19640792,
+        "sha256": "3c3bc3048303721c904a03eb8326b631e921f11cc3be2988456a42f115daf04c",
+        "version": "3.10.11",
         "licenses": ["Python-2.0", "CNRI-Python"],
         "license_file": "LICENSE.cpython.txt",
         "python_tag": "cp310",
     },
     "cpython-3.11": {
-        "url": "https://www.python.org/ftp/python/3.11.1/Python-3.11.1.tar.xz",
-        "size": 19856648,
-        "sha256": "85879192f2cffd56cb16c092905949ebf3e5e394b7f764723529637901dfb58f",
-        "version": "3.11.1",
+        "url": "https://www.python.org/ftp/python/3.11.3/Python-3.11.3.tar.xz",
+        "size": 19906156,
+        "sha256": "8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e",
+        "version": "3.11.3",
         "licenses": ["Python-2.0", "CNRI-Python"],
         "license_file": "LICENSE.cpython.txt",
         "python_tag": "cp311",