From 3bada9d61ca34b364a6333df5c5845cf7728480d Mon Sep 17 00:00:00 2001
From: "Anthony Sottile (deadsnakes)" <asottile+deadsnakes@umich.edu>
Date: Sat, 14 Sep 2024 22:27:17 +0000
Subject: [PATCH] update to 0c5fc27217525c4e40b4064e6979f467540c2fc8 (nightly)

---
 changelogs/nightly/focal                |  6 ++++++
 changelogs/nightly/noble                |  6 ++++++
 cpython                                 |  2 +-
 patches/argparse-no-shutil.diff         |  2 +-
 patches/ctypes-arm.diff                 |  2 +-
 patches/deb-locations.diff              |  6 +++---
 patches/deb-setup.diff                  |  4 ++--
 patches/disable-some-tests.diff         |  2 +-
 patches/distutils-install-layout.diff   | 18 +++++++++---------
 patches/distutils-link.diff             |  2 +-
 patches/ext-no-libpython-link.diff      |  2 +-
 patches/lib-argparse.diff               |  2 +-
 patches/lib2to3-no-pickled-grammar.diff |  2 +-
 patches/locale-module.diff              |  2 +-
 patches/multiarch-extname.diff          | 10 +++++-----
 patches/tempfile-minimal.diff           |  4 ++--
 patches/tkinter-import.diff             |  2 +-
 17 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/changelogs/nightly/focal b/changelogs/nightly/focal
index 0037ba9..a9f39fa 100644
--- a/changelogs/nightly/focal
+++ b/changelogs/nightly/focal
@@ -1,3 +1,9 @@
+python3.10 (3.10.15-1-g0c5fc27217-1+focal1) focal; urgency=medium
+
+  * Update to v3.10.15-1-g0c5fc27217.
+
+ -- Anthony Sottile (deadsnakes) <asottile+deadsnakes@umich.edu>  Sat, 14 Sep 2024 22:27:17 +0000
+
 python3.10 (3.10.15-1+focal1) focal; urgency=medium
 
   * Python 3.10.15 release.
diff --git a/changelogs/nightly/noble b/changelogs/nightly/noble
index 66abaa4..e6985b4 100644
--- a/changelogs/nightly/noble
+++ b/changelogs/nightly/noble
@@ -1,3 +1,9 @@
+python3.10 (3.10.15-1-g0c5fc27217-1+noble1) noble; urgency=medium
+
+  * Update to v3.10.15-1-g0c5fc27217.
+
+ -- Anthony Sottile (deadsnakes) <asottile+deadsnakes@umich.edu>  Sat, 14 Sep 2024 22:27:17 +0000
+
 python3.10 (3.10.15-1+noble1) noble; urgency=medium
 
   * Python 3.10.15 release.
diff --git a/cpython b/cpython
index ffee63f..0c5fc27 160000
--- a/cpython
+++ b/cpython
@@ -1 +1 @@
-Subproject commit ffee63f34445412322a7afc2535731be221cabba
+Subproject commit 0c5fc27217525c4e40b4064e6979f467540c2fc8
diff --git a/patches/argparse-no-shutil.diff b/patches/argparse-no-shutil.diff
index e3469e8..a3733ac 100644
--- a/patches/argparse-no-shutil.diff
+++ b/patches/argparse-no-shutil.diff
@@ -10,7 +10,7 @@ diff --git a/Lib/argparse.py b/Lib/argparse.py
 index a23d6bb..a65d210 100644
 --- a/Lib/argparse.py
 +++ b/Lib/argparse.py
-@@ -175,9 +175,12 @@ class HelpFormatter(object):
+@@ -175,9 +175,12 @@ def __init__(self,
  
          # default setting for width
          if width is None:
diff --git a/patches/ctypes-arm.diff b/patches/ctypes-arm.diff
index 1a0b727..bf8718d 100644
--- a/patches/ctypes-arm.diff
+++ b/patches/ctypes-arm.diff
@@ -11,7 +11,7 @@ diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
 index 0c2510e..3907247 100644
 --- a/Lib/ctypes/util.py
 +++ b/Lib/ctypes/util.py
-@@ -269,16 +269,27 @@ elif os.name == "posix":
+@@ -269,16 +269,27 @@ def find_library(name, is64 = False):
  
          def _findSoname_ldconfig(name):
              import struct
diff --git a/patches/deb-locations.diff b/patches/deb-locations.diff
index 4a6cda4..c3c0ee0 100644
--- a/patches/deb-locations.diff
+++ b/patches/deb-locations.diff
@@ -13,7 +13,7 @@ diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
 index 01d5331..d25b82f 100644
 --- a/Lib/distutils/command/install.py
 +++ b/Lib/distutils/command/install.py
-@@ -33,13 +33,13 @@ SCHEME_KEYS = ('purelib', 'platlib', 'headers', 'scripts', 'data')
+@@ -33,13 +33,13 @@
  # alter locations for packages installations in a single place.
  # Note that this module is deprecated (PEP 632); all consumers
  # of this information should switch to using sysconfig directly.
@@ -33,7 +33,7 @@ diff --git a/Lib/pydoc.py b/Lib/pydoc.py
 index e00ba41..497d33f 100755
 --- a/Lib/pydoc.py
 +++ b/Lib/pydoc.py
-@@ -31,6 +31,10 @@ to a file named "<name>.html".
+@@ -31,6 +31,10 @@ class or function within a module or module in a package.  If the
  
  Module docs for core modules are assumed to be in
  
@@ -48,7 +48,7 @@ diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
 index daf9f00..a7fcc7a 100644
 --- a/Lib/sysconfig.py
 +++ b/Lib/sysconfig.py
-@@ -56,7 +56,32 @@ _INSTALL_SCHEMES = {
+@@ -56,7 +56,32 @@
          'scripts': '{base}/Scripts',
          'data': '{base}',
          },
diff --git a/patches/deb-setup.diff b/patches/deb-setup.diff
index f6e4cda..19f74ba 100644
--- a/patches/deb-setup.diff
+++ b/patches/deb-setup.diff
@@ -12,7 +12,7 @@ diff --git a/setup.py b/setup.py
 index a39610a..28c5cb7 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -464,8 +464,10 @@ class PyBuildExt(build_ext):
+@@ -464,8 +464,10 @@ def set_compiler_executables(self):
          # unfortunately, distutils doesn't let us provide separate C and C++
          # compilers
          if compiler is not None:
@@ -25,7 +25,7 @@ index a39610a..28c5cb7 100644
          self.compiler.set_executables(**args)
  
      def build_extensions(self):
-@@ -822,12 +824,7 @@ class PyBuildExt(build_ext):
+@@ -822,12 +824,7 @@ def add_ldflags_cppflags(self):
                          add_dir_to_list(dir_list, directory)
  
      def configure_compiler(self):
diff --git a/patches/disable-some-tests.diff b/patches/disable-some-tests.diff
index f4090e4..3cb284f 100644
--- a/patches/disable-some-tests.diff
+++ b/patches/disable-some-tests.diff
@@ -12,7 +12,7 @@ diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_bu
 index 8e7364d..76c8c3a 100644
 --- a/Lib/distutils/tests/test_build_ext.py
 +++ b/Lib/distutils/tests/test_build_ext.py
-@@ -115,6 +115,7 @@ class BuildExtTestCase(TempdirManager,
+@@ -115,6 +115,7 @@ def test_xx(self):
          """)
          assert_python_ok('-c', code)
  
diff --git a/patches/distutils-install-layout.diff b/patches/distutils-install-layout.diff
index 69a1522..8968ac1 100644
--- a/patches/distutils-install-layout.diff
+++ b/patches/distutils-install-layout.diff
@@ -33,7 +33,7 @@ index d25b82f..81b501e 100644
          ]
  
      boolean_options = ['compile', 'force', 'skip-build']
-@@ -168,6 +171,7 @@ class install(Command):
+@@ -168,6 +171,7 @@ def initialize_options(self):
          self.exec_prefix = None
          self.home = None
          self.user = 0
@@ -41,7 +41,7 @@ index d25b82f..81b501e 100644
  
          # These select only the installation base; it's up to the user to
          # specify the installation scheme (currently, that means supplying
-@@ -190,6 +194,9 @@ class install(Command):
+@@ -190,6 +194,9 @@ def initialize_options(self):
              self.install_userbase = USER_BASE
              self.install_usersite = USER_SITE
  
@@ -51,7 +51,7 @@ index d25b82f..81b501e 100644
          self.compile = None
          self.optimize = None
  
-@@ -436,6 +443,7 @@ class install(Command):
+@@ -436,6 +443,7 @@ def finalize_unix(self):
              self.install_base = self.install_platbase = self.home
              self.select_scheme("unix_home")
          else:
@@ -59,7 +59,7 @@ index d25b82f..81b501e 100644
              if self.prefix is None:
                  if self.exec_prefix is not None:
                      raise DistutilsOptionError(
-@@ -450,7 +458,26 @@ class install(Command):
+@@ -450,7 +458,26 @@ def finalize_unix(self):
  
              self.install_base = self.prefix
              self.install_platbase = self.exec_prefix
@@ -164,7 +164,7 @@ diff --git a/Lib/distutils/tests/test_bdist_dumb.py b/Lib/distutils/tests/test_b
 index 01a233b..f99dec5 100644
 --- a/Lib/distutils/tests/test_bdist_dumb.py
 +++ b/Lib/distutils/tests/test_bdist_dumb.py
-@@ -85,7 +85,7 @@ class BuildDumbTestCase(support.TempdirManager,
+@@ -85,7 +85,7 @@ def test_simple_built(self):
              fp.close()
  
          contents = sorted(filter(None, map(os.path.basename, contents)))
@@ -177,7 +177,7 @@ diff --git a/Lib/distutils/tests/test_install.py b/Lib/distutils/tests/test_inst
 index 0632024..bfc8fe1 100644
 --- a/Lib/distutils/tests/test_install.py
 +++ b/Lib/distutils/tests/test_install.py
-@@ -205,7 +205,7 @@ class InstallTestCase(support.TempdirManager,
+@@ -205,7 +205,7 @@ def test_record(self):
          found = [os.path.basename(line) for line in content.splitlines()]
          expected = ['hello.py', 'hello.%s.pyc' % sys.implementation.cache_tag,
                      'sayhi',
@@ -186,7 +186,7 @@ index 0632024..bfc8fe1 100644
          self.assertEqual(found, expected)
  
      def test_record_extensions(self):
-@@ -238,7 +238,7 @@ class InstallTestCase(support.TempdirManager,
+@@ -238,7 +238,7 @@ def test_record_extensions(self):
  
          found = [os.path.basename(line) for line in content.splitlines()]
          expected = [_make_ext_name('xx'),
@@ -199,7 +199,7 @@ diff --git a/Lib/pydoc.py b/Lib/pydoc.py
 index 497d33f..bd64f23 100755
 --- a/Lib/pydoc.py
 +++ b/Lib/pydoc.py
-@@ -509,6 +509,7 @@ class Doc:
+@@ -509,6 +509,7 @@ def getdocloc(self, object, basedir=sysconfig.get_path('stdlib')):
                                   'marshal', 'posix', 'signal', 'sys',
                                   '_thread', 'zipimport') or
               (file.startswith(basedir) and
@@ -260,7 +260,7 @@ diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
 index c70e1fa..288a642 100644
 --- a/Lib/test/test_site.py
 +++ b/Lib/test/test_site.py
-@@ -323,16 +323,16 @@ class HelperFunctionsTests(unittest.TestCase):
+@@ -323,16 +323,16 @@ def test_getsitepackages(self):
          if os.sep == '/':
              # OS X, Linux, FreeBSD, etc
              if sys.platlibdir != "lib":
diff --git a/patches/distutils-link.diff b/patches/distutils-link.diff
index bb565ff..94eda86 100644
--- a/patches/distutils-link.diff
+++ b/patches/distutils-link.diff
@@ -12,7 +12,7 @@ diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py
 index d00c489..70b4cb5 100644
 --- a/Lib/distutils/unixccompiler.py
 +++ b/Lib/distutils/unixccompiler.py
-@@ -155,6 +155,17 @@ class UnixCCompiler(CCompiler):
+@@ -155,6 +155,17 @@ def link(self, target_desc, objects,
                                          runtime_library_dirs)
          libraries, library_dirs, runtime_library_dirs = fixed_args
  
diff --git a/patches/ext-no-libpython-link.diff b/patches/ext-no-libpython-link.diff
index edcd755..3e2c5ba 100644
--- a/patches/ext-no-libpython-link.diff
+++ b/patches/ext-no-libpython-link.diff
@@ -12,7 +12,7 @@ diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ex
 index 1a9bd12..05692b1 100644
 --- a/Lib/distutils/command/build_ext.py
 +++ b/Lib/distutils/command/build_ext.py
-@@ -231,7 +231,7 @@ class build_ext(Command):
+@@ -231,7 +231,7 @@ def finalize_options(self):
          # For building extensions with a shared Python library,
          # Python's library directory must be appended to library_dirs
          # See Issues: #1600860, #4366
diff --git a/patches/lib-argparse.diff b/patches/lib-argparse.diff
index 88cb274..66c1862 100644
--- a/patches/lib-argparse.diff
+++ b/patches/lib-argparse.diff
@@ -12,7 +12,7 @@ diff --git a/Lib/argparse.py b/Lib/argparse.py
 index 736bf5a..a23d6bb 100644
 --- a/Lib/argparse.py
 +++ b/Lib/argparse.py
-@@ -89,7 +89,16 @@ import os as _os
+@@ -89,7 +89,16 @@
  import re as _re
  import sys as _sys
  
diff --git a/patches/lib2to3-no-pickled-grammar.diff b/patches/lib2to3-no-pickled-grammar.diff
index 5a9024d..dcddea0 100644
--- a/patches/lib2to3-no-pickled-grammar.diff
+++ b/patches/lib2to3-no-pickled-grammar.diff
@@ -27,7 +27,7 @@ diff --git a/Lib/lib2to3/tests/test_parser.py b/Lib/lib2to3/tests/test_parser.py
 index 90a1b34..5fdba0c 100644
 --- a/Lib/lib2to3/tests/test_parser.py
 +++ b/Lib/lib2to3/tests/test_parser.py
-@@ -39,87 +39,6 @@ class TestDriver(support.TestCase):
+@@ -39,87 +39,6 @@ def test_formfeed(self):
          self.assertEqual(t.children[1].children[0].type, syms.print_stmt)
  
  
diff --git a/patches/locale-module.diff b/patches/locale-module.diff
index b8aef3e..370d22c 100644
--- a/patches/locale-module.diff
+++ b/patches/locale-module.diff
@@ -16,7 +16,7 @@ diff --git a/Lib/locale.py b/Lib/locale.py
 index 6d4f519..088ab26 100644
 --- a/Lib/locale.py
 +++ b/Lib/locale.py
-@@ -1415,8 +1415,8 @@ locale_alias = {
+@@ -1415,8 +1415,8 @@ def getpreferredencoding(do_setlocale=True):
      'ug_cn':                                'ug_CN.UTF-8',
      'uk':                                   'uk_UA.KOI8-U',
      'uk_ua':                                'uk_UA.KOI8-U',
diff --git a/patches/multiarch-extname.diff b/patches/multiarch-extname.diff
index 9ac9087..3fc79ae 100644
--- a/patches/multiarch-extname.diff
+++ b/patches/multiarch-extname.diff
@@ -17,7 +17,7 @@ diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
 index 81b501e..5f542d5 100644
 --- a/Lib/distutils/command/install.py
 +++ b/Lib/distutils/command/install.py
-@@ -196,6 +196,7 @@ class install(Command):
+@@ -196,6 +196,7 @@ def initialize_options(self):
  
          # enable custom installation, known values: deb
          self.install_layout = None
@@ -25,7 +25,7 @@ index 81b501e..5f542d5 100644
          
          self.compile = None
          self.optimize = None
-@@ -460,6 +461,8 @@ class install(Command):
+@@ -460,6 +461,8 @@ def finalize_unix(self):
              self.install_platbase = self.exec_prefix
              if self.install_layout:
                  if self.install_layout.lower() in ['deb']:
@@ -38,7 +38,7 @@ diff --git a/Lib/distutils/command/install_lib.py b/Lib/distutils/command/instal
 index 6154cf0..eef6362 100644
 --- a/Lib/distutils/command/install_lib.py
 +++ b/Lib/distutils/command/install_lib.py
-@@ -56,6 +56,7 @@ class install_lib(Command):
+@@ -56,6 +56,7 @@ def initialize_options(self):
          self.compile = None
          self.optimize = None
          self.skip_build = None
@@ -46,7 +46,7 @@ index 6154cf0..eef6362 100644
  
      def finalize_options(self):
          # Get all the information we need to install pure Python modules
-@@ -68,6 +69,7 @@ class install_lib(Command):
+@@ -68,6 +69,7 @@ def finalize_options(self):
                                     ('compile', 'compile'),
                                     ('optimize', 'optimize'),
                                     ('skip_build', 'skip_build'),
@@ -54,7 +54,7 @@ index 6154cf0..eef6362 100644
                                    )
  
          if self.compile is None:
-@@ -108,6 +110,8 @@ class install_lib(Command):
+@@ -108,6 +110,8 @@ def build(self):
  
      def install(self):
          if os.path.isdir(self.build_dir):
diff --git a/patches/tempfile-minimal.diff b/patches/tempfile-minimal.diff
index a010408..5b3f8f4 100644
--- a/patches/tempfile-minimal.diff
+++ b/patches/tempfile-minimal.diff
@@ -12,7 +12,7 @@ diff --git a/Lib/tempfile.py b/Lib/tempfile.py
 index fd78998..60bc519 100644
 --- a/Lib/tempfile.py
 +++ b/Lib/tempfile.py
-@@ -40,7 +40,146 @@ import functools as _functools
+@@ -40,7 +40,146 @@
  import warnings as _warnings
  import io as _io
  import os as _os
@@ -160,7 +160,7 @@ index fd78998..60bc519 100644
  import errno as _errno
  from random import Random as _Random
  import sys as _sys
-@@ -861,7 +1000,7 @@ class TemporaryDirectory:
+@@ -861,7 +1000,7 @@ def onerror(func, path, exc_info):
                  if not ignore_errors:
                      raise
  
diff --git a/patches/tkinter-import.diff b/patches/tkinter-import.diff
index a386c86..3c1ca59 100644
--- a/patches/tkinter-import.diff
+++ b/patches/tkinter-import.diff
@@ -12,7 +12,7 @@ diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
 index 7b8dc7b..61b7b70 100644
 --- a/Lib/tkinter/__init__.py
 +++ b/Lib/tkinter/__init__.py
-@@ -34,7 +34,10 @@ import enum
+@@ -34,7 +34,10 @@
  import sys
  import types