Skip to content

Commit

Permalink
update to 8b275e77d235b0e813f996173fc26eaa3484737c (nightly)
Browse files Browse the repository at this point in the history
  • Loading branch information
deadsnakes-issues-bot committed Sep 14, 2024
1 parent 8c24acf commit d308f11
Show file tree
Hide file tree
Showing 18 changed files with 49 additions and 31 deletions.
6 changes: 6 additions & 0 deletions changelogs/nightly/focal
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
python3.11 (3.11.10-1-g8b275e77d2-1+focal1) focal; urgency=medium

* Update to v3.11.10-1-g8b275e77d2.

-- Anthony Sottile (deadsnakes) <[email protected]> Sat, 14 Sep 2024 22:19:01 +0000

python3.11 (3.11.10-1+focal1) focal; urgency=medium

* Python 3.11.10 release.
Expand Down
6 changes: 6 additions & 0 deletions changelogs/nightly/jammy
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
python3.11 (3.11.10-1-g8b275e77d2-1+jammy1) jammy; urgency=medium

* Update to v3.11.10-1-g8b275e77d2.

-- Anthony Sottile (deadsnakes) <[email protected]> Sat, 14 Sep 2024 22:19:02 +0000

python3.11 (3.11.10-1+jammy1) jammy; urgency=medium

* Python 3.11.10 release.
Expand Down
6 changes: 6 additions & 0 deletions changelogs/nightly/noble
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
python3.11 (3.11.10-1-g8b275e77d2-1+noble1) noble; urgency=medium

* Update to v3.11.10-1-g8b275e77d2.

-- Anthony Sottile (deadsnakes) <[email protected]> Sat, 14 Sep 2024 22:19:02 +0000

python3.11 (3.11.10-1+noble1) noble; urgency=medium

* Python 3.11.10 release.
Expand Down
2 changes: 1 addition & 1 deletion cpython
Submodule cpython updated 1 files
+1 −1 Include/patchlevel.h
2 changes: 1 addition & 1 deletion patches/argparse-no-shutil.diff
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ diff --git a/Lib/argparse.py b/Lib/argparse.py
index cc7f84e..6435549 100644
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -178,9 +178,12 @@ class HelpFormatter(object):
@@ -178,9 +178,12 @@ def __init__(self,

# default setting for width
if width is None:
Expand Down
2 changes: 1 addition & 1 deletion patches/ctypes-arm.diff
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index c550883..e7652aa 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -272,16 +272,27 @@ elif os.name == "posix":
@@ -272,16 +272,27 @@ def find_library(name, is64 = False):

def _findSoname_ldconfig(name):
import struct
Expand Down
2 changes: 1 addition & 1 deletion patches/deb-locations.diff
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index a8cfeaf..660b345 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

Expand Down
4 changes: 2 additions & 2 deletions patches/deb-setup.diff
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ diff --git a/setup.py b/setup.py
index ad8fb81..0fa1974 100644
--- a/setup.py
+++ b/setup.py
@@ -484,8 +484,10 @@ class PyBuildExt(build_ext):
@@ -484,8 +484,10 @@ def set_compiler_executables(self):
# unfortunately, distutils doesn't let us provide separate C and C++
# compilers
if compiler is not None:
Expand All @@ -25,7 +25,7 @@ index ad8fb81..0fa1974 100644
self.compiler.set_executables(**args)

def build_extensions(self):
@@ -844,12 +846,7 @@ class PyBuildExt(build_ext):
@@ -844,12 +846,7 @@ def add_ldflags_cppflags(self):
add_dir_to_list(dir_list, directory)

def configure_compiler(self):
Expand Down
2 changes: 1 addition & 1 deletion patches/disable-some-tests.diff
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_bu
index e89dc50..a35aba4 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)

Expand Down
22 changes: 11 additions & 11 deletions patches/distutils-install-layout.diff
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
index 01d5331..81b501e 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.
Expand All @@ -44,15 +44,15 @@ index 01d5331..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
+ self.prefix_option = None

# 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

Expand All @@ -62,15 +62,15 @@ index 01d5331..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:
+ self.prefix_option = self.prefix
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
Expand Down Expand Up @@ -175,7 +175,7 @@ diff --git a/Lib/distutils/tests/test_bdist_dumb.py b/Lib/distutils/tests/test_b
index b41812b..95a49f4 100644
--- a/Lib/distutils/tests/test_bdist_dumb.py
+++ b/Lib/distutils/tests/test_bdist_dumb.py
@@ -84,7 +84,7 @@ class BuildDumbTestCase(support.TempdirManager,
@@ -84,7 +84,7 @@ def test_simple_built(self):
fp.close()

contents = sorted(filter(None, map(os.path.basename, contents)))
Expand All @@ -188,7 +188,7 @@ diff --git a/Lib/distutils/tests/test_install.py b/Lib/distutils/tests/test_inst
index c30414d..eece987 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',
Expand All @@ -197,7 +197,7 @@ index c30414d..eece987 100644
self.assertEqual(found, expected)

@requires_subprocess()
@@ -239,7 +239,7 @@ class InstallTestCase(support.TempdirManager,
@@ -239,7 +239,7 @@ def test_record_extensions(self):

found = [os.path.basename(line) for line in content.splitlines()]
expected = [_make_ext_name('xx'),
Expand All @@ -210,7 +210,7 @@ diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 660b345..8a38c74 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -527,6 +527,7 @@ class Doc:
@@ -527,6 +527,7 @@ def getdocloc(self, object, basedir=sysconfig.get_path('stdlib')):
'marshal', 'posix', 'signal', 'sys',
'_thread', 'zipimport') or
(file.startswith(basedir) and
Expand Down Expand Up @@ -271,7 +271,7 @@ diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index ebe3711..41a5ad6 100644
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -95,6 +95,30 @@ _INSTALL_SCHEMES = {
@@ -95,6 +95,30 @@
'scripts': '{base}/Scripts',
'data': '{base}',
},
Expand Down Expand Up @@ -338,7 +338,7 @@ diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 427f0b6..4b96486 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -326,16 +326,16 @@ class HelperFunctionsTests(unittest.TestCase):
@@ -326,16 +326,16 @@ def test_getsitepackages(self):
if os.sep == '/':
# OS X, Linux, FreeBSD, etc
if sys.platlibdir != "lib":
Expand Down
2 changes: 1 addition & 1 deletion patches/distutils-link.diff
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion patches/ext-no-libpython-link.diff
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ex
index f287b34..6859303 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
Expand Down
2 changes: 1 addition & 1 deletion patches/lib-argparse.diff
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ diff --git a/Lib/argparse.py b/Lib/argparse.py
index 2f5ecda..cc7f84e 100644
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -91,7 +91,16 @@ import sys as _sys
@@ -91,7 +91,16 @@

import warnings

Expand Down
2 changes: 1 addition & 1 deletion patches/lib2to3-no-pickled-grammar.diff
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ diff --git a/Lib/lib2to3/tests/test_parser.py b/Lib/lib2to3/tests/test_parser.py
index 8e7773b..5fdba0c 100644
--- a/Lib/lib2to3/tests/test_parser.py
+++ b/Lib/lib2to3/tests/test_parser.py
@@ -39,88 +39,6 @@ class TestDriver(support.TestCase):
@@ -39,88 +39,6 @@ def test_formfeed(self):
self.assertEqual(t.children[1].children[0].type, syms.print_stmt)


Expand Down
2 changes: 1 addition & 1 deletion patches/locale-module.diff
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ diff --git a/Lib/locale.py b/Lib/locale.py
index f45841e..cd551d1 100644
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -1444,8 +1444,8 @@ locale_alias = {
@@ -1444,8 +1444,8 @@ def getpreferredencoding(do_setlocale=True):
'ug_cn': 'ug_CN.UTF-8',
'uk': 'uk_UA.KOI8-U',
'uk_ua': 'uk_UA.KOI8-U',
Expand Down
10 changes: 5 additions & 5 deletions patches/multiarch-extname.diff
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ 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
+ self.multiarch = None

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']:
Expand All @@ -38,23 +38,23 @@ 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
+ self.multiarch = None # if we should rename the extensions

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'),
+ ('multiarch', 'multiarch'),
)

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):
Expand Down
4 changes: 2 additions & 2 deletions patches/tempfile-minimal.diff
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ diff --git a/Lib/tempfile.py b/Lib/tempfile.py
index abb5f45..c23894f 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
Expand Down Expand Up @@ -160,7 +160,7 @@ index abb5f45..c23894f 100644
import stat as _stat
import errno as _errno
from random import Random as _Random
@@ -926,7 +1065,7 @@ class TemporaryDirectory:
@@ -926,7 +1065,7 @@ def onerror(func, path, exc_info):
if not ignore_errors:
raise

Expand Down
2 changes: 1 addition & 1 deletion patches/tkinter-import.diff
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
index 254f63f..29d6e1e 100644
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -35,7 +35,10 @@ import enum
@@ -35,7 +35,10 @@
import sys
import types

Expand Down

0 comments on commit d308f11

Please sign in to comment.