Mailman 3 July 2021 - Python-checkins

Fail the CI if an optional module fails to compile (GH-27466)
by ambv July 30, 2021

July 30, 2021

https://github.com/python/cpython/commit/7cad0bee80a536c7e47f54cf4317417583… commit: 7cad0bee80a536c7e47f54cf43174175834f30a0 branch: main author: Pablo Galindo Salgado <Pablogsal(a)gmail.com> committer: ambv <lukasz(a)langa.pl> date: 2021-07-30T16:21:09+02:00 summary: Fail the CI if an optional module fails to compile (GH-27466) files: M .github/workflows/build.yml M .travis.yml M setup.py diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d79999b229ba..4081b36f926a2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -119,6 +119,8 @@ jobs: runs-on: macos-latest needs: check_source if: needs.check_source.outputs.run_tests == 'true' + env: + PYTHONSTRICTEXTENSIONBUILD: 1 steps: - uses: actions/checkout@v2 - name: Configure CPython @@ -137,6 +139,7 @@ jobs: if: needs.check_source.outputs.run_tests == 'true' env: OPENSSL_VER: 1.1.1k + PYTHONSTRICTEXTENSIONBUILD: 1 steps: - uses: actions/checkout@v2 - name: Register gcc problem matcher @@ -227,6 +230,7 @@ jobs: if: needs.check_source.outputs.run_tests == 'true' env: OPENSSL_VER: 1.1.1k + PYTHONSTRICTEXTENSIONBUILD: 1 ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0 steps: - uses: actions/checkout@v2 diff --git a/.travis.yml b/.travis.yml index 4b85da1a44c03..b2f7e27458711 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ env: # Set rpath with env var instead of -Wl,-rpath linker flag # OpenSSL ignores LDFLAGS when linking bin/openssl - LD_RUN_PATH="${OPENSSL_DIR}/lib" + - PYTHONSTRICTEXTENSIONBUILD=1 branches: only: diff --git a/setup.py b/setup.py index 78eb68b8492f3..59b2548810cbf 100644 --- a/setup.py +++ b/setup.py @@ -571,6 +571,9 @@ def print_three_column(lst): print("Custom linker flags may require --with-openssl-rpath=auto") print() + if os.environ.get("PYTHONSTRICTEXTENSIONBUILD") and (self.failed or self.failed_on_import): + raise RuntimeError("Failed to build some stdlib modules") + def build_extension(self, ext): if ext.name == '_ctypes':

1 0

Doc: Change errant 3.10.0 to 3.10, to match other mentions (GH-27459) (GH-27479)
by ambv July 30, 2021

July 30, 2021

https://github.com/python/cpython/commit/6ca35f2891a4d88503dbb3143db21a0ff2… commit: 6ca35f2891a4d88503dbb3143db21a0ff258915b branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: ambv <lukasz(a)langa.pl> date: 2021-07-30T16:16:46+02:00 summary: Doc: Change errant 3.10.0 to 3.10, to match other mentions (GH-27459) (GH-27479) (cherry picked from commit f4367ba3c533fc2dc9e32aa431d674f715b911f2) Co-authored-by: Ori Avtalion <ori(a)avtalion.name> files: M Doc/library/typing.rst diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst index 8cccdc0d62246..e8d7c9ee01bd1 100644 --- a/Doc/library/typing.rst +++ b/Doc/library/typing.rst @@ -150,7 +150,7 @@ See :pep:`484` for more details. .. versionadded:: 3.5.2 -.. versionchanged:: 3.10.0 +.. versionchanged:: 3.10 ``NewType`` is now a class rather than a function. There is some additional runtime cost when calling ``NewType`` over a regular function. However, this cost will be reduced in 3.11.0. @@ -1323,7 +1323,7 @@ These are not used in annotations. They are building blocks for declaring types. .. versionadded:: 3.5.2 - .. versionchanged:: 3.10.0 + .. versionchanged:: 3.10 ``NewType`` is now a class rather than a function. .. class:: TypedDict(dict)

1 0

Doc: Change errant 3.10.0 to 3.10, to match other mentions (GH-27459)
by ambv July 30, 2021

July 30, 2021

https://github.com/python/cpython/commit/f4367ba3c533fc2dc9e32aa431d674f715… commit: f4367ba3c533fc2dc9e32aa431d674f715b911f2 branch: main author: Ori Avtalion <ori(a)avtalion.name> committer: ambv <lukasz(a)langa.pl> date: 2021-07-30T15:55:09+02:00 summary: Doc: Change errant 3.10.0 to 3.10, to match other mentions (GH-27459) files: M Doc/library/typing.rst diff --git a/Doc/library/typing.rst b/Doc/library/typing.rst index 8cccdc0d62246..e8d7c9ee01bd1 100644 --- a/Doc/library/typing.rst +++ b/Doc/library/typing.rst @@ -150,7 +150,7 @@ See :pep:`484` for more details. .. versionadded:: 3.5.2 -.. versionchanged:: 3.10.0 +.. versionchanged:: 3.10 ``NewType`` is now a class rather than a function. There is some additional runtime cost when calling ``NewType`` over a regular function. However, this cost will be reduced in 3.11.0. @@ -1323,7 +1323,7 @@ These are not used in annotations. They are building blocks for declaring types. .. versionadded:: 3.5.2 - .. versionchanged:: 3.10.0 + .. versionchanged:: 3.10 ``NewType`` is now a class rather than a function. .. class:: TypedDict(dict)

1 0

Update URLs in comments and metadata to use HTTPS (GH-27458)
by ambv July 30, 2021

July 30, 2021

https://github.com/python/cpython/commit/be42c06bb01206209430f3ac08b72643dc… commit: be42c06bb01206209430f3ac08b72643dc7cad1c branch: main author: Noah Kantrowitz <noah(a)coderanger.net> committer: ambv <lukasz(a)langa.pl> date: 2021-07-30T15:54:46+02:00 summary: Update URLs in comments and metadata to use HTTPS (GH-27458) files: M Doc/conf.py M Doc/library/ast.rst M Doc/library/contextlib.rst M Doc/library/functools.rst M Doc/library/re.rst M Doc/library/webbrowser.rst M Lib/ctypes/test/test_functions.py M Lib/ctypes/test/test_loading.py M Lib/distutils/README M Lib/functools.py M Lib/idlelib/macosx.py M Lib/lib2to3/tests/data/py2_test_grammar.py M Lib/lib2to3/tests/data/py3_test_grammar.py M Lib/pydoc.py M Lib/test/test_docxmlrpc.py M Lib/turtle.py M Lib/urllib/request.py M Lib/weakref.py M Lib/xml/etree/ElementInclude.py M Lib/xml/etree/ElementPath.py M Lib/xml/etree/ElementTree.py M Lib/xml/etree/__init__.py M Lib/xmlrpc/server.py M Mac/BuildScript/resources/License.rtf M Mac/README.rst M Modules/_cursesmodule.c M Modules/_elementtree.c M Modules/_winapi.c M Modules/gc_weakref.txt M Parser/tokenizer.c M Tools/freeze/README M Tools/i18n/pygettext.py M Tools/msi/README.txt M Tools/msi/buildrelease.bat M Tools/msi/bundle/bundle.wxs M Tools/msi/common_en-US.wxl_template M Tools/msi/exe/exe_en-US.wxl_template M Tools/msi/msi.props M setup.py diff --git a/Doc/conf.py b/Doc/conf.py index 2a1d0e3dfd873e..f626ce67b3c742 100644 --- a/Doc/conf.py +++ b/Doc/conf.py @@ -85,7 +85,7 @@ # Custom sidebar templates, filenames relative to this file. html_sidebars = { - # Defaults taken from http://www.sphinx-doc.org/en/stable/config.html#confval-html_sidebars + # Defaults taken from https://www.sphinx-doc.org/en/master/usage/configuration.html#confval-html_… # Removes the quick search block '**': ['localtoc.html', 'relations.html', 'customsourcelink.html'], 'index': ['indexsidebar.html'], diff --git a/Doc/library/ast.rst b/Doc/library/ast.rst index b3646ef88ccbe1..19e7bcc414b84b 100644 --- a/Doc/library/ast.rst +++ b/Doc/library/ast.rst @@ -1795,7 +1795,7 @@ Function and class definitions * ``bases`` is a list of nodes for explicitly specified base classes. * ``keywords`` is a list of :class:`keyword` nodes, principally for 'metaclass'. Other keywords will be passed to the metaclass, as per `PEP-3115 - <http://www.python.org/dev/peps/pep-3115/>`_. + <https://www.python.org/dev/peps/pep-3115/>`_. * ``starargs`` and ``kwargs`` are each a single node, as in a function call. starargs will be expanded to join the list of base classes, and kwargs will be passed to the metaclass. diff --git a/Doc/library/contextlib.rst b/Doc/library/contextlib.rst index 38f619a66d6d81..bc38a63a52d97c 100644 --- a/Doc/library/contextlib.rst +++ b/Doc/library/contextlib.rst @@ -171,7 +171,7 @@ Functions and classes provided: from contextlib import closing from urllib.request import urlopen - with closing(urlopen('http://www.python.org')) as page: + with closing(urlopen('https://www.python.org')) as page: for line in page: print(line) diff --git a/Doc/library/functools.rst b/Doc/library/functools.rst index 871c94afaf99ec..e40fe7bb85fc6d 100644 --- a/Doc/library/functools.rst +++ b/Doc/library/functools.rst @@ -202,7 +202,7 @@ The :mod:`functools` module defines the following functions: @lru_cache(maxsize=32) def get_pep(num): 'Retrieve text of a Python Enhancement Proposal' - resource = 'http://www.python.org/dev/peps/pep-%04d/' % num + resource = 'https://www.python.org/dev/peps/pep-%04d/' % num try: with urllib.request.urlopen(resource) as s: return s.read() diff --git a/Doc/library/re.rst b/Doc/library/re.rst index 9abbd8ba73616e..950012a9b0fe2f 100644 --- a/Doc/library/re.rst +++ b/Doc/library/re.rst @@ -931,8 +931,8 @@ form. This is useful if you want to match an arbitrary literal string that may have regular expression metacharacters in it. For example:: - >>> print(re.escape('http://www.python.org')) - http://www\.python\.org + >>> print(re.escape('https://www.python.org')) + https://www\.python\.org >>> legal_chars = string.ascii_lowercase + string.digits + "!#$%&'*+-.^_`|~:" >>> print('[%s]+' % re.escape(legal_chars)) diff --git a/Doc/library/webbrowser.rst b/Doc/library/webbrowser.rst index 85a15b485185d4..bd0919164d8fa0 100644 --- a/Doc/library/webbrowser.rst +++ b/Doc/library/webbrowser.rst @@ -39,7 +39,7 @@ parameters: ``-n`` opens the URL in a new browser window, if possible; ``-t`` opens the URL in a new browser page ("tab"). The options are, naturally, mutually exclusive. Usage example:: - python -m webbrowser -t "http://www.python.org" + python -m webbrowser -t "https://www.python.org" The following exception is defined: @@ -176,7 +176,7 @@ Notes: Here are some simple examples:: - url = 'http://docs.python.org/' + url = 'https://docs.python.org/' # Open URL in a new tab, if a browser window is already open. webbrowser.open_new_tab(url) diff --git a/Lib/ctypes/test/test_functions.py b/Lib/ctypes/test/test_functions.py index 75628924206bce..d3c6536f2766a7 100644 --- a/Lib/ctypes/test/test_functions.py +++ b/Lib/ctypes/test/test_functions.py @@ -389,7 +389,7 @@ class S8I(Structure): (9*2, 8*3, 7*4, 6*5, 5*6, 4*7, 3*8, 2*9)) def test_sf1651235(self): - # see http://www.python.org/sf/1651235 + # see https://www.python.org/sf/1651235 proto = CFUNCTYPE(c_int, RECT, POINT) def callback(*args): diff --git a/Lib/ctypes/test/test_loading.py b/Lib/ctypes/test/test_loading.py index 7b930f92c70cfb..ea892277c4eae9 100644 --- a/Lib/ctypes/test/test_loading.py +++ b/Lib/ctypes/test/test_loading.py @@ -93,7 +93,7 @@ def test_1703286_A(self): # NOT fit into a 32-bit integer. FreeLibrary must be able # to accept this address. - # These are tests for http://www.python.org/sf/1703286 + # These are tests for https://www.python.org/sf/1703286 handle = LoadLibrary("advapi32") FreeLibrary(handle) diff --git a/Lib/distutils/README b/Lib/distutils/README index 23f488506f8508..73bd25187c0270 100644 --- a/Lib/distutils/README +++ b/Lib/distutils/README @@ -2,10 +2,10 @@ This directory contains the Distutils package. There's a full documentation available at: - http://docs.python.org/distutils/ + https://docs.python.org/distutils/ The Distutils-SIG web page is also a good starting point: - http://www.python.org/sigs/distutils-sig/ + https://www.python.org/sigs/distutils-sig/ $Id$ diff --git a/Lib/functools.py b/Lib/functools.py index b1f1fe8d9a6f27..357c1dfd909fa9 100644 --- a/Lib/functools.py +++ b/Lib/functools.py @@ -492,7 +492,7 @@ def lru_cache(maxsize=128, typed=False): with f.cache_info(). Clear the cache and statistics with f.cache_clear(). Access the underlying function with f.__wrapped__. - See: http://en.wikipedia.org/wiki/Cache_replacement_policies#Least_recently_used… + See: https://en.wikipedia.org/wiki/Cache_replacement_policies#Least_recently_use… """ @@ -660,7 +660,7 @@ def cache(user_function, /): def _c3_merge(sequences): """Merges MROs in *sequences* to a single MRO using the C3 algorithm. - Adapted from http://www.python.org/download/releases/2.3/mro/. + Adapted from https://www.python.org/download/releases/2.3/mro/. """ result = [] diff --git a/Lib/idlelib/macosx.py b/Lib/idlelib/macosx.py index eeaab59ae80295..470de5d89cadd4 100644 --- a/Lib/idlelib/macosx.py +++ b/Lib/idlelib/macosx.py @@ -83,7 +83,7 @@ def tkVersionWarning(root): return False return ("WARNING: The version of Tcl/Tk ({0}) in use may" " be unstable.\n" - "Visit http://www.python.org/download/mac/tcltk/" + "Visit https://www.python.org/download/mac/tcltk/" " for current information.".format(patchlevel)) else: return False diff --git a/Lib/lib2to3/tests/data/py2_test_grammar.py b/Lib/lib2to3/tests/data/py2_test_grammar.py index b5a4137d1615ef..866316173a5b3b 100644 --- a/Lib/lib2to3/tests/data/py2_test_grammar.py +++ b/Lib/lib2to3/tests/data/py2_test_grammar.py @@ -735,7 +735,7 @@ def testSelectors(self): s = a[-5:] s = a[:-1] s = a[-4:-3] - # A rough test of SF bug 1333982. http://python.org/sf/1333982 + # A rough test of SF bug 1333982. https://python.org/sf/1333982 # The testing here is fairly incomplete. # Test cases should include: commas with 1 and 2 colons d = {} diff --git a/Lib/lib2to3/tests/data/py3_test_grammar.py b/Lib/lib2to3/tests/data/py3_test_grammar.py index d06223207e1ec0..e1eee524874f84 100644 --- a/Lib/lib2to3/tests/data/py3_test_grammar.py +++ b/Lib/lib2to3/tests/data/py3_test_grammar.py @@ -714,7 +714,7 @@ def testSelectors(self): s = a[-5:] s = a[:-1] s = a[-4:-3] - # A rough test of SF bug 1333982. http://python.org/sf/1333982 + # A rough test of SF bug 1333982. https://python.org/sf/1333982 # The testing here is fairly incomplete. # Test cases should include: commas with 1 and 2 colons d = {} diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 16036186f75769..9f0acd0271e077 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -694,7 +694,7 @@ def markup(self, text, escape=None, funcs={}, classes={}, methods={}): url = 'http://www.rfc-editor.org/rfc/rfc%d.txt' % int(rfc) results.append('<a href="%s">%s</a>' % (url, escape(all))) elif pep: - url = 'http://www.python.org/dev/peps/pep-%04d/' % int(pep) + url = 'https://www.python.org/dev/peps/pep-%04d/' % int(pep) results.append('<a href="%s">%s</a>' % (url, escape(all))) elif selfdot: # Create a link for methods like 'self.method(...)' diff --git a/Lib/test/test_docxmlrpc.py b/Lib/test/test_docxmlrpc.py index 7d3e30cbee964a..77252502883112 100644 --- a/Lib/test/test_docxmlrpc.py +++ b/Lib/test/test_docxmlrpc.py @@ -133,7 +133,7 @@ def test_autolinking(self): self.assertIn( (b'<dl><dt><a name="-add"><strong>add</strong></a>(x, y)</dt><dd>' b'<tt>Add two instances together. This ' - b'follows <a href="http://www.python.org/dev/peps/pep-0008/">' + b'follows <a href="https://www.python.org/dev/peps/pep-0008/">' b'PEP008</a>, but has nothing<br>\nto do ' b'with <a href="http://www.rfc-editor.org/rfc/rfc1952.txt">' b'RFC1952</a>. Case should matter: pEp008 ' diff --git a/Lib/turtle.py b/Lib/turtle.py index 95d55e9e1c8042..2e573245b803a7 100644 --- a/Lib/turtle.py +++ b/Lib/turtle.py @@ -38,7 +38,7 @@ ----- turtle.py This module is an extended reimplementation of turtle.py from the -Python standard distribution up to Python 2.5. (See: http://www.python.org) +Python standard distribution up to Python 2.5. (See: https://www.python.org) It tries to keep the merits of turtle.py and to be (nearly) 100% compatible with it. This means in the first place to enable the diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index 8363905f20fa35..eca6cc350161f2 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -64,7 +64,7 @@ # install it urllib.request.install_opener(opener) -f = urllib.request.urlopen('http://www.python.org/') +f = urllib.request.urlopen('https://www.python.org/') """ # XXX issues: diff --git a/Lib/weakref.py b/Lib/weakref.py index 5fa851dd6d771c..a968139f986314 100644 --- a/Lib/weakref.py +++ b/Lib/weakref.py @@ -2,7 +2,7 @@ This module is an implementation of PEP 205: -http://www.python.org/dev/peps/pep-0205/ +https://www.python.org/dev/peps/pep-0205/ """ # Naming convention: Variables named "wr" are weak reference objects; diff --git a/Lib/xml/etree/ElementInclude.py b/Lib/xml/etree/ElementInclude.py index 5303062716c47a..40a9b22292479f 100644 --- a/Lib/xml/etree/ElementInclude.py +++ b/Lib/xml/etree/ElementInclude.py @@ -42,7 +42,7 @@ # -------------------------------------------------------------------- # Licensed to PSF under a Contributor Agreement. -# See http://www.python.org/psf/license for licensing details. +# See https://www.python.org/psf/license for licensing details. ## # Limited XInclude support for the ElementTree package. diff --git a/Lib/xml/etree/ElementPath.py b/Lib/xml/etree/ElementPath.py index 0d401db568b6a9..cd3c354d0813ee 100644 --- a/Lib/xml/etree/ElementPath.py +++ b/Lib/xml/etree/ElementPath.py @@ -48,7 +48,7 @@ # -------------------------------------------------------------------- # Licensed to PSF under a Contributor Agreement. -# See http://www.python.org/psf/license for licensing details. +# See https://www.python.org/psf/license for licensing details. ## # Implementation module for XPath support. There's usually no reason diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py index 99246800b98663..e9409fd29a1157 100644 --- a/Lib/xml/etree/ElementTree.py +++ b/Lib/xml/etree/ElementTree.py @@ -35,7 +35,7 @@ #--------------------------------------------------------------------- # Licensed to PSF under a Contributor Agreement. -# See http://www.python.org/psf/license for licensing details. +# See https://www.python.org/psf/license for licensing details. # # ElementTree # Copyright (c) 1999-2008 by Fredrik Lundh. All rights reserved. @@ -1283,7 +1283,7 @@ class XMLPullParser: def __init__(self, events=None, *, _parser=None): # The _parser argument is for internal use only and must not be relied # upon in user code. It will be removed in a future release. - # See http://bugs.python.org/issue17741 for more details. + # See https://bugs.python.org/issue17741 for more details. self._events_queue = collections.deque() self._parser = _parser or XMLParser(target=TreeBuilder()) diff --git a/Lib/xml/etree/__init__.py b/Lib/xml/etree/__init__.py index 27fd8f6d4e3602..e2ec53421d3f70 100644 --- a/Lib/xml/etree/__init__.py +++ b/Lib/xml/etree/__init__.py @@ -30,4 +30,4 @@ # -------------------------------------------------------------------- # Licensed to PSF under a Contributor Agreement. -# See http://www.python.org/psf/license for licensing details. +# See https://www.python.org/psf/license for licensing details. diff --git a/Lib/xmlrpc/server.py b/Lib/xmlrpc/server.py index 287e3243b10cc5..69a260f5b12c07 100644 --- a/Lib/xmlrpc/server.py +++ b/Lib/xmlrpc/server.py @@ -750,7 +750,7 @@ def markup(self, text, escape=None, funcs={}, classes={}, methods={}): url = 'http://www.rfc-editor.org/rfc/rfc%d.txt' % int(rfc) results.append('<a href="%s">%s</a>' % (url, escape(all))) elif pep: - url = 'http://www.python.org/dev/peps/pep-%04d/' % int(pep) + url = 'https://www.python.org/dev/peps/pep-%04d/' % int(pep) results.append('<a href="%s">%s</a>' % (url, escape(all))) elif text[end:end+1] == '(': results.append(self.namelink(name, methods, funcs, classes)) diff --git a/Mac/BuildScript/resources/License.rtf b/Mac/BuildScript/resources/License.rtf index ca7dd0413a450e..7fe7e66f4c0b69 100644 --- a/Mac/BuildScript/resources/License.rtf +++ b/Mac/BuildScript/resources/License.rtf @@ -16,7 +16,7 @@ Python was created in the early 1990s by Guido van Rossum at Stichting Mathemati \ In 1995, Guido continued his work on Python at the Corporation for National Research Initiatives (CNRI, see http://www.cnri.reston.va.us) in Reston, Virginia where he released several versions of the software.\ \ -In May 2000, Guido and the Python core development team moved to BeOpen.com to form the BeOpen PythonLabs team. In October of the same year, the PythonLabs team moved to Digital Creations (now Zope Corporation, see http://www.zope.org). In 2001, the Python Software Foundation (PSF, see http://www.python.org/psf/) was formed, a non-profit organization created specifically to own Python-related Intellectual Property. Zope Corporation is a sponsoring member of the PSF.\ +In May 2000, Guido and the Python core development team moved to BeOpen.com to form the BeOpen PythonLabs team. In October of the same year, the PythonLabs team moved to Digital Creations (now Zope Corporation, see http://www.zope.org). In 2001, the Python Software Foundation (PSF, see https://www.python.org/psf/) was formed, a non-profit organization created specifically to own Python-related Intellectual Property. Zope Corporation is a sponsoring member of the PSF.\ \ All Python releases are Open Source (see http://www.opensource.org for the Open Source Definition). Historically, most, but not all, Python releases have also been GPL-compatible; the table below summarizes the various releases.\ \ diff --git a/Mac/README.rst b/Mac/README.rst index 766c57f155a797..7dd41a3ee4725a 100644 --- a/Mac/README.rst +++ b/Mac/README.rst @@ -226,7 +226,7 @@ distribution, this is installed by default on macOS 10.4 or later. Be aware, though, that the Cocoa-based AquaTk's supplied starting with macOS 10.6 have proven to be unstable. If possible, you should consider installing a newer version before building on macOS 10.6 or later, such as -the ActiveTcl 8.6. See http://www.python.org/download/mac/tcltk/. If you +the ActiveTcl 8.6. See https://www.python.org/download/mac/tcltk/. If you are building with an SDK, ensure that the newer Tcl and Tk frameworks are seen in the SDK's ``Library/Frameworks`` directory; you may need to manually create symlinks to their installed location, ``/Library/Frameworks``. @@ -293,7 +293,7 @@ GUI programs. As of 3.4.0, the ``pythonwx.x`` aliases are no longer installed. How do I create a binary distribution? ====================================== -Download and unpack the source release from http://www.python.org/download/. +Download and unpack the source release from https://www.python.org/download/. Go to the directory ``Mac/BuildScript``. There you will find a script ``build-installer.py`` that does all the work. This will download and build a number of 3rd-party libaries, configures and builds a framework Python, @@ -334,9 +334,9 @@ The configure script sometimes emits warnings like the one below:: configure: WARNING: libintl.h: section "Present But Cannot Be Compiled" configure: WARNING: libintl.h: proceeding with the preprocessor's result configure: WARNING: libintl.h: in the future, the compiler will take precedence - configure: WARNING: ## -------------------------------------- ## - configure: WARNING: ## Report this to http://bugs.python.org/ ## - configure: WARNING: ## -------------------------------------- ## + configure: WARNING: ## --------------------------------------- ## + configure: WARNING: ## Report this to https://bugs.python.org/ ## + configure: WARNING: ## --------------------------------------- ## This almost always means you are trying to build a universal binary for Python and have libraries in ``/usr/local`` that don't contain the required @@ -399,8 +399,8 @@ The basic implementation pattern is: Resources ========= - * http://www.python.org/download/mac/ + * https://www.python.org/downloads/macos/ - * http://www.python.org/community/sigs/current/pythonmac-sig/ + * https://www.python.org/community/sigs/current/pythonmac-sig/ * https://devguide.python.org/ diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c index b6b7ca458b454a..61aaf855229f86 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -35,7 +35,7 @@ A number of SysV or ncurses functions don't have wrappers yet; if you need a given function, add it and send a patch. See - http://www.python.org/dev/patches/ for instructions on how to submit + https://www.python.org/dev/patches/ for instructions on how to submit patches to Python. Here's a list of currently unsupported functions: diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c index 85fdfa7e5ed42c..b4528a90b3e095 100644 --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------- * Licensed to PSF under a Contributor Agreement. - * See http://www.python.org/psf/license for licensing details. + * See https://www.python.org/psf/license for licensing details. * * _elementtree - C accelerator for xml.etree.ElementTree * Copyright (c) 1999-2009 by Secret Labs AB. All rights reserved. diff --git a/Modules/_winapi.c b/Modules/_winapi.c index bf2498a017aff7..3e24d512cac384 100644 --- a/Modules/_winapi.c +++ b/Modules/_winapi.c @@ -32,7 +32,7 @@ */ /* Licensed to PSF under a Contributor Agreement. */ -/* See http://www.python.org/2.4/license for licensing details. */ +/* See https://www.python.org/2.4/license for licensing details. */ #include "Python.h" #include "pycore_moduleobject.h" // _PyModule_GetState() diff --git a/Modules/gc_weakref.txt b/Modules/gc_weakref.txt index 2f18402c02a51d..b5b9f7b2e3d4dc 100644 --- a/Modules/gc_weakref.txt +++ b/Modules/gc_weakref.txt @@ -47,7 +47,7 @@ soon as we execute Python code, threads other than the gc thread can run too, and they can do ordinary things with weakrefs that end up resurrecting CT while gc is running. - http://www.python.org/sf/1055820 + https://www.python.org/sf/1055820 shows how innocent it can be, and also how nasty. Variants of the three focussed test cases attached to that bug report are now part of Python's diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c index 50a0afc05cb839..90eee28e126539 100644 --- a/Parser/tokenizer.c +++ b/Parser/tokenizer.c @@ -545,7 +545,7 @@ ensure_utf8(char *line, struct tok_state *tok) "Non-UTF-8 code starting with '\\x%.2x' " "in file %U on line %i, " "but no encoding declared; " - "see http://python.org/dev/peps/pep-0263/ for details", + "see https://python.org/dev/peps/pep-0263/ for details", badchar, tok->filename, tok->lineno + 1); return 0; } diff --git a/Tools/freeze/README b/Tools/freeze/README index 5bc5b049d5b86c..098107c5d1a9d2 100644 --- a/Tools/freeze/README +++ b/Tools/freeze/README @@ -293,4 +293,4 @@ module ...: Additional Python modules (referenced by pathname) ---Guido van Rossum (home page: http://www.python.org/~guido/) +--Guido van Rossum (home page: https://www.python.org/~guido/) diff --git a/Tools/i18n/pygettext.py b/Tools/i18n/pygettext.py index 9dd65c221fd9da..6f889adffe6c7a 100755 --- a/Tools/i18n/pygettext.py +++ b/Tools/i18n/pygettext.py @@ -52,8 +52,8 @@ pygettext searches only for _() by default, but see the -k/--keyword flag below for how to augment this. - [1] http://www.python.org/workshops/1997-10/proceedings/loewis.html - [2] http://www.gnu.org/software/gettext/gettext.html + [1] https://www.python.org/workshops/1997-10/proceedings/loewis.html + [2] https://www.gnu.org/software/gettext/gettext.html NOTE: pygettext attempts to be option and feature compatible with GNU xgettext where ever possible. However some options are still missing or are diff --git a/Tools/msi/README.txt b/Tools/msi/README.txt index 82635f3d2c2a14..c85ee4564d8387 100644 --- a/Tools/msi/README.txt +++ b/Tools/msi/README.txt @@ -167,7 +167,7 @@ The following properties may be passed when building these projects. by providing a unique URI for this property. It does not need to be an active internet address. Defaults to $(ComputerName). - Official releases use http://www.python.org/(architecture name) + Official releases use https://www.python.org/(architecture name) /p:DownloadUrlBase=(any URI) Specifies the base of a URL where missing parts of the installer layout diff --git a/Tools/msi/buildrelease.bat b/Tools/msi/buildrelease.bat index b72eedecb23cf2..4fbaf2c99ba9b8 100644 --- a/Tools/msi/buildrelease.bat +++ b/Tools/msi/buildrelease.bat @@ -12,7 +12,7 @@ rem rem The following substitutions will be applied to the release URI: rem Variable Description Example rem {arch} architecture amd64, win32 -set RELEASE_URI=http://www.python.org/{arch} +set RELEASE_URI=https://www.python.org/{arch} rem This is the URL that will be used to download installation files. rem The files available from the default URL *will* conflict with your diff --git a/Tools/msi/bundle/bundle.wxs b/Tools/msi/bundle/bundle.wxs index ddd6870f625526..e2f871889340fb 100644 --- a/Tools/msi/bundle/bundle.wxs +++ b/Tools/msi/bundle/bundle.wxs @@ -7,7 +7,7 @@ Version="$(var.Version)" IconSourceFile="..\..\..\PC\icons\setup.ico" Manufacturer="!(loc.Manufacturer)" - AboutUrl="http://www.python.org/" + AboutUrl="https://www.python.org/" Compressed="no" dep:ProviderKey="CPython-$(var.MajorVersionNumber).$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)"> <BootstrapperApplication Id="PythonBA" SourceFile="$(var.BootstrapApp)"> diff --git a/Tools/msi/common_en-US.wxl_template b/Tools/msi/common_en-US.wxl_template index c95c271c27a79c..adb8f40be9a8e2 100644 --- a/Tools/msi/common_en-US.wxl_template +++ b/Tools/msi/common_en-US.wxl_template @@ -14,5 +14,5 @@ <String Id="NoDowngrade">A newer version of !(loc.ProductName) is already installed.</String> <String Id="IncorrectCore">An incorrect version of a prerequisite package is installed. Please uninstall any other versions of !(loc.ProductName) and try installing this again.</String> <String Id="NoTargetDir">The TARGETDIR variable must be provided when invoking this installer.</String> - <String Id="ManufacturerSupportUrl">http://www.python.org/</String> + <String Id="ManufacturerSupportUrl">https://www.python.org/</String> </WixLocalization> diff --git a/Tools/msi/exe/exe_en-US.wxl_template b/Tools/msi/exe/exe_en-US.wxl_template index 1f9e290394b42c..4cd9e3e654b2a1 100644 --- a/Tools/msi/exe/exe_en-US.wxl_template +++ b/Tools/msi/exe/exe_en-US.wxl_template @@ -4,5 +4,5 @@ <String Id="ShortDescriptor">executable</String> <String Id="ShortcutName">Python {{ShortVersion}} ({{Bitness}})</String> <String Id="ShortcutDescription">Launches the !(loc.ProductName) interpreter.</String> - <String Id="SupportUrl">http://www.python.org/</String> + <String Id="SupportUrl">https://www.python.org/</String> </WixLocalization> diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props index 3f14501446a15a..cb9221fddf8ec7 100644 --- a/Tools/msi/msi.props +++ b/Tools/msi/msi.props @@ -28,7 +28,7 @@ that intend to bundle Python should rebuild these modules with their own URI to avoid conflicting with the official releases. - The official releases use "http://www.python.org/$(ArchName)" + The official releases use "https://www.python.org/$(ArchName)" This is not the same as the DownloadUrl property used in the bundle projects. diff --git a/setup.py b/setup.py index 97f101a2c57683..78eb68b8492f3d 100644 --- a/setup.py +++ b/setup.py @@ -1034,7 +1034,7 @@ def detect_test_extensions(self): # Python PEP-3118 (buffer protocol) test module self.add(Extension('_testbuffer', ['_testbuffer.c'])) - # Test loading multiple modules from one compiled file (http://bugs.python.org/issue16421) + # Test loading multiple modules from one compiled file (https://bugs.python.org/issue16421) self.add(Extension('_testimportmultiple', ['_testimportmultiple.c'])) # Test multi-phase extension module init (PEP 489) @@ -1237,7 +1237,7 @@ def detect_dbm_gdbm(self): # similar functionality (but slower of course) implemented in Python. # Sleepycat^WOracle Berkeley DB interface. - # http://www.oracle.com/database/berkeley-db/db/index.html + # https://www.oracle.com/database/technologies/related/berkeleydb.html # # This requires the Sleepycat^WOracle DB code. The supported versions # are set below. Visit the URL above to download @@ -1279,7 +1279,7 @@ def gen_db_minor_ver_nums(major): '/usr/include/db3', '/usr/local/include/db3', '/opt/sfw/include/db3', - # Fink defaults (http://fink.sourceforge.net/) + # Fink defaults (https://www.finkproject.org/) '/sw/include/db4', '/sw/include/db3', ] @@ -1291,7 +1291,7 @@ def gen_db_minor_ver_nums(major): db_inc_paths.append('/usr/local/include/db4%d' % x) db_inc_paths.append('/pkg/db-4.%d/include' % x) db_inc_paths.append('/opt/db-4.%d/include' % x) - # MacPorts default (http://www.macports.org/) + # MacPorts default (https://www.macports.org/) db_inc_paths.append('/opt/local/include/db4%d' % x) # 3.x minor number specific paths for x in gen_db_minor_ver_nums(3): @@ -2397,12 +2397,12 @@ def detect_decimal(self): # Workarounds for toolchain bugs: if sysconfig.get_config_var('HAVE_IPA_PURE_CONST_BUG'): # Some versions of gcc miscompile inline asm: - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491 - # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491 + # https://gcc.gnu.org/ml/gcc/2010-11/msg00366.html extra_compile_args.append('-fno-ipa-pure-const') if sysconfig.get_config_var('HAVE_GLIBC_MEMMOVE_BUG'): # _FORTIFY_SOURCE wrappers for memmove and bcopy are incorrect: - # http://sourceware.org/ml/libc-alpha/2010-12/msg00009.html + # https://sourceware.org/ml/libc-alpha/2010-12/msg00009.html undef_macros.append('_FORTIFY_SOURCE') # Uncomment for extra functionality: @@ -2707,7 +2707,7 @@ class DummyProcess: setup(# PyPI Metadata (PEP 301) name = "Python", version = sys.version.split()[0], - url = "http://www.python.org/%d.%d" % sys.version_info[:2], + url = "https://www.python.org/%d.%d" % sys.version_info[:2], maintainer = "Guido van Rossum and the Python community", maintainer_email = "python-dev(a)python.org", description = "A high-level object-oriented programming language",

1 0

bpo-44747: Refactor usage of sys._getframe at typing module (#27387)
by ambv July 30, 2021

July 30, 2021

https://github.com/python/cpython/commit/ea4673ed0757e9bfe8774e60cfae3313e9… commit: ea4673ed0757e9bfe8774e60cfae3313e9927b5f branch: main author: Yurii Karabas <1998uriyyo(a)gmail.com> committer: ambv <lukasz(a)langa.pl> date: 2021-07-30T15:49:24+02:00 summary: bpo-44747: Refactor usage of sys._getframe at typing module (#27387) Co-authored-by: Ken Jin <28750310+Fidget-Spinner(a)users.noreply.github.com> files: A Misc/NEWS.d/next/Library/2021-07-27-12-06-19.bpo-44747.epUzZz.rst M Lib/typing.py diff --git a/Lib/typing.py b/Lib/typing.py index 2826525efff7a..702bb647269d0 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -798,10 +798,7 @@ def __init__(self, name, *constraints, bound=None, raise TypeError("A single constraint is not allowed") msg = "TypeVar(name, constraint, ...): constraints must be types." self.__constraints__ = tuple(_type_check(t, msg) for t in constraints) - try: - def_mod = sys._getframe(1).f_globals.get('__name__', '__main__') # for pickling - except (AttributeError, ValueError): - def_mod = None + def_mod = _caller() if def_mod != 'typing': self.__module__ = def_mod @@ -904,10 +901,7 @@ def kwargs(self): def __init__(self, name, *, bound=None, covariant=False, contravariant=False): self.__name__ = name super().__init__(bound, covariant, contravariant) - try: - def_mod = sys._getframe(1).f_globals.get('__name__', '__main__') - except (AttributeError, ValueError): - def_mod = None + def_mod = _caller() if def_mod != 'typing': self.__module__ = def_mod @@ -1400,10 +1394,7 @@ def _allow_reckless_class_checks(depth=3): The abc and functools modules indiscriminately call isinstance() and issubclass() on the whole MRO of a user class, which may contain protocols. """ - try: - return sys._getframe(depth).f_globals['__name__'] in ['abc', 'functools'] - except (AttributeError, ValueError): # For platforms without _getframe(). - return True + return _caller(depth) in {'abc', 'functools', None} _PROTO_ALLOWLIST = { @@ -2238,11 +2229,7 @@ class Employee(NamedTuple): elif kwargs: raise TypeError("Either list of fields or keywords" " can be provided to NamedTuple, not both") - try: - module = sys._getframe(1).f_globals.get('__name__', '__main__') - except (AttributeError, ValueError): - module = None - return _make_nmtuple(typename, fields, module=module) + return _make_nmtuple(typename, fields, module=_caller()) _NamedTuple = type.__new__(NamedTupleMeta, 'NamedTuple', (), {}) @@ -2357,11 +2344,10 @@ class body be required. " but not both") ns = {'__annotations__': dict(fields)} - try: + module = _caller() + if module is not None: # Setting correct module is necessary to make typed dict classes pickleable. - ns['__module__'] = sys._getframe(1).f_globals.get('__name__', '__main__') - except (AttributeError, ValueError): - pass + ns['__module__'] = module return _TypedDictMeta(typename, (), ns, total=total) diff --git a/Misc/NEWS.d/next/Library/2021-07-27-12-06-19.bpo-44747.epUzZz.rst b/Misc/NEWS.d/next/Library/2021-07-27-12-06-19.bpo-44747.epUzZz.rst new file mode 100644 index 0000000000000..e63d77f76de92 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-07-27-12-06-19.bpo-44747.epUzZz.rst @@ -0,0 +1,2 @@ +Refactor usage of ``sys._getframe`` in ``typing`` module. Patch provided by +Yurii Karabas.

1 0

bpo-44761: Change default value of NewType __module__ attr (GH-27406) (GH-27477)
by ambv July 30, 2021

July 30, 2021

https://github.com/python/cpython/commit/56122b0bba7a9e2e3ec672a6c22bfdd7ec… commit: 56122b0bba7a9e2e3ec672a6c22bfdd7ecf08cbe branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: ambv <lukasz(a)langa.pl> date: 2021-07-30T15:48:01+02:00 summary: bpo-44761: Change default value of NewType __module__ attr (GH-27406) (GH-27477) (cherry picked from commit 7b975f81e4dba70a42c6279539a7fcfe4211b4c0) Co-authored-by: Yurii Karabas <1998uriyyo(a)gmail.com> files: M Lib/test/test_typing.py M Lib/typing.py diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index bbda6aa2f13b5..3bc9b9cb8e6ed 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -3752,6 +3752,12 @@ def test_pickle(self): with self.assertRaises(pickle.PicklingError): pickle.dumps(UserAge, proto) + def test_missing__name__(self): + code = ("import typing\n" + "NT = typing.NewType('NT', int)\n" + ) + exec(code, {}) + class NamedTupleTests(BaseTestCase): class NestedEmployee(NamedTuple): diff --git a/Lib/typing.py b/Lib/typing.py index 2c2d8ec1a1e96..bcb22b2d178c3 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -1379,11 +1379,11 @@ def _no_init(self, *args, **kwargs): if type(self)._is_protocol: raise TypeError('Protocols cannot be instantiated') -def _callee(depth=2, default=None): +def _caller(depth=1, default='__main__'): try: - return sys._getframe(depth).f_globals['__name__'] + return sys._getframe(depth + 1).f_globals.get('__name__', default) except (AttributeError, ValueError): # For platforms without _getframe() - return default + return None def _allow_reckless_class_checks(depth=3): @@ -2385,8 +2385,10 @@ def __init__(self, name, tp): if '.' in name: name = name.rpartition('.')[-1] self.__name__ = name - self.__module__ = _callee(default='typing') self.__supertype__ = tp + def_mod = _caller() + if def_mod != 'typing': + self.__module__ = def_mod def __repr__(self): return f'{self.__module__}.{self.__qualname__}'

1 0

bpo-44761: Change default value of NewType __module__ attr (GH-27406)
by ambv July 30, 2021

July 30, 2021

https://github.com/python/cpython/commit/7b975f81e4dba70a42c6279539a7fcfe42… commit: 7b975f81e4dba70a42c6279539a7fcfe4211b4c0 branch: main author: Yurii Karabas <1998uriyyo(a)gmail.com> committer: ambv <lukasz(a)langa.pl> date: 2021-07-30T14:56:12+02:00 summary: bpo-44761: Change default value of NewType __module__ attr (GH-27406) files: M Lib/test/test_typing.py M Lib/typing.py diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index bc9021addbe35..06bd49b593a77 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -3777,6 +3777,12 @@ def test_pickle(self): with self.assertRaises(pickle.PicklingError): pickle.dumps(UserAge, proto) + def test_missing__name__(self): + code = ("import typing\n" + "NT = typing.NewType('NT', int)\n" + ) + exec(code, {}) + class NewTypePythonTests(NewTypeTests, BaseTestCase): module = py_typing diff --git a/Lib/typing.py b/Lib/typing.py index f07b00f32ece9..2826525efff7a 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -1387,11 +1387,11 @@ def _no_init(self, *args, **kwargs): if type(self)._is_protocol: raise TypeError('Protocols cannot be instantiated') -def _callee(depth=2, default=None): +def _caller(depth=1, default='__main__'): try: - return sys._getframe(depth).f_globals['__name__'] + return sys._getframe(depth + 1).f_globals.get('__name__', default) except (AttributeError, ValueError): # For platforms without _getframe() - return default + return None def _allow_reckless_class_checks(depth=3): @@ -2395,8 +2395,10 @@ def __init__(self, name, tp): if '.' in name: name = name.rpartition('.')[-1] self.__name__ = name - self.__module__ = _callee(default='typing') self.__supertype__ = tp + def_mod = _caller() + if def_mod != 'typing': + self.__module__ = def_mod def __repr__(self): return f'{self.__module__}.{self.__qualname__}'

1 0

Add missing gdbm dependencies to the UNIX CI (GH-27467) (GH-27468)
by ambv July 30, 2021

July 30, 2021

https://github.com/python/cpython/commit/a603aa472a38f778e2ed0cce73168e15f0… commit: a603aa472a38f778e2ed0cce73168e15f03c352c branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: ambv <lukasz(a)langa.pl> date: 2021-07-30T14:07:30+02:00 summary: Add missing gdbm dependencies to the UNIX CI (GH-27467) (GH-27468) (cherry picked from commit 851cca8c22795a2f143ad5ebc10adab3c7784ad0) Co-authored-by: Pablo Galindo Salgado <Pablogsal(a)gmail.com> files: M .github/workflows/posix-deps-apt.sh diff --git a/.github/workflows/posix-deps-apt.sh b/.github/workflows/posix-deps-apt.sh index 56cc70edf60001..0119843e47eeb1 100755 --- a/.github/workflows/posix-deps-apt.sh +++ b/.github/workflows/posix-deps-apt.sh @@ -9,6 +9,7 @@ apt-get -yq install \ libbz2-dev \ libffi-dev \ libgdbm-dev \ + libgdbm-compat-dev \ liblzma-dev \ libncurses5-dev \ libreadline6-dev \

1 0

[3.10] bpo-31746: Prevent segfaults when sqlite3.Connection is uninitialised (GH-27431). (GH-27472)
by ambv July 30, 2021

July 30, 2021

https://github.com/python/cpython/commit/0cb470e622ba37920c72e4d8f284741b9f… commit: 0cb470e622ba37920c72e4d8f284741b9fbaea8b branch: 3.10 author: Erlend Egeberg Aasland <erlend.aasland(a)innova.no> committer: ambv <lukasz(a)langa.pl> date: 2021-07-30T14:01:22+02:00 summary: [3.10] bpo-31746: Prevent segfaults when sqlite3.Connection is uninitialised (GH-27431). (GH-27472) (cherry picked from commit 7e311e496b0e26b3d3c62fe9b0ed2a4677c37ee9) Co-authored-by: Erlend Egeberg Aasland <erlend.aasland(a)innova.no> files: M Lib/sqlite3/test/dbapi.py M Modules/_sqlite/connection.c diff --git a/Lib/sqlite3/test/dbapi.py b/Lib/sqlite3/test/dbapi.py index a958d4df8bb0c8..2d02045b72e8d6 100644 --- a/Lib/sqlite3/test/dbapi.py +++ b/Lib/sqlite3/test/dbapi.py @@ -197,6 +197,26 @@ def test_open_uri(self): cx.execute('insert into test(id) values(1)') +class UninitialisedConnectionTests(unittest.TestCase): + def setUp(self): + self.cx = sqlite.Connection.__new__(sqlite.Connection) + + def test_uninit_operations(self): + funcs = ( + lambda: self.cx.isolation_level, + lambda: self.cx.total_changes, + lambda: self.cx.in_transaction, + lambda: self.cx.iterdump(), + lambda: self.cx.cursor(), + lambda: self.cx.close(), + ) + for func in funcs: + with self.subTest(func=func): + self.assertRaisesRegex(sqlite.ProgrammingError, + "Base Connection.__init__ not called", + func) + + class CursorTests(unittest.TestCase): def setUp(self): self.cx = sqlite.connect(":memory:") @@ -949,6 +969,7 @@ def suite(): ModuleTests, SqliteOnConflictTests, ThreadTests, + UninitialisedConnectionTests, ] return unittest.TestSuite( [unittest.TestLoader().loadTestsFromTestCase(t) for t in tests] diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index 95f6029d126756..9c05a154559d92 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -92,8 +92,6 @@ pysqlite_connection_init(pysqlite_Connection *self, PyObject *args, database = PyBytes_AsString(database_obj); - self->initialized = 1; - self->begin_statement = NULL; Py_CLEAR(self->statement_cache); @@ -128,7 +126,7 @@ pysqlite_connection_init(pysqlite_Connection *self, PyObject *args, Py_INCREF(isolation_level); } Py_CLEAR(self->isolation_level); - if (pysqlite_connection_set_isolation_level(self, isolation_level, NULL) < 0) { + if (pysqlite_connection_set_isolation_level(self, isolation_level, NULL) != 0) { Py_DECREF(isolation_level); return -1; } @@ -187,6 +185,8 @@ pysqlite_connection_init(pysqlite_Connection *self, PyObject *args, return -1; } + self->initialized = 1; + return 0; } @@ -359,6 +359,12 @@ pysqlite_connection_close_impl(pysqlite_Connection *self) return NULL; } + if (!self->initialized) { + PyErr_SetString(pysqlite_ProgrammingError, + "Base Connection.__init__ not called."); + return NULL; + } + pysqlite_do_all_statements(self, ACTION_FINALIZE, 1); if (self->db) { @@ -1264,6 +1270,9 @@ int pysqlite_check_thread(pysqlite_Connection* self) static PyObject* pysqlite_connection_get_isolation_level(pysqlite_Connection* self, void* unused) { + if (!pysqlite_check_connection(self)) { + return NULL; + } return Py_NewRef(self->isolation_level); } @@ -1295,11 +1304,17 @@ pysqlite_connection_set_isolation_level(pysqlite_Connection* self, PyObject* iso return -1; } if (isolation_level == Py_None) { - PyObject *res = pysqlite_connection_commit(self, NULL); - if (!res) { - return -1; + /* We might get called during connection init, so we cannot use + * pysqlite_connection_commit() here. */ + if (self->db && !sqlite3_get_autocommit(self->db)) { + int rc; + Py_BEGIN_ALLOW_THREADS + rc = sqlite3_exec(self->db, "COMMIT", NULL, NULL, NULL); + Py_END_ALLOW_THREADS + if (rc != SQLITE_OK) { + return _pysqlite_seterror(self->db, NULL); + } } - Py_DECREF(res); self->begin_statement = NULL; } else {

1 0

bpo-44753: Don't use logfile extension when determining old files to be deleted (GH-27475)
by vsajip July 30, 2021

July 30, 2021

https://github.com/python/cpython/commit/6ff890380971752299325bd28eab80ec93… commit: 6ff890380971752299325bd28eab80ec936975cf branch: main author: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> committer: vsajip <vinay_sajip(a)yahoo.co.uk> date: 2021-07-30T12:48:50+01:00 summary: bpo-44753: Don't use logfile extension when determining old files to be deleted (GH-27475) files: M Lib/logging/handlers.py diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index 9506b9acdd4fa3..e2579db58046df 100644 --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -359,7 +359,8 @@ def getFilesToDelete(self): dirName, baseName = os.path.split(self.baseFilename) fileNames = os.listdir(dirName) result = [] - prefix = baseName + "." + # See bpo-44753: Don't use the extension when computing the prefix. + prefix = os.path.splitext(baseName)[0] + "." plen = len(prefix) for fileName in fileNames: if fileName[:plen] == prefix:

1 0