Mailman 3 September 2021 - Python-checkins

[3.8] bpo-44394: Ensure libexpat is linked against libm (GH-28617) (GH-28620)
by ambv 29 Sep '21

29 Sep '21

https://github.com/python/cpython/commit/90004fca1cc3c6e3c9b2c3faae5cb1b7d7… commit: 90004fca1cc3c6e3c9b2c3faae5cb1b7d7711648 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: ambv <lukasz(a)langa.pl> date: 2021-09-29T16:35:53+02:00 summary: [3.8] bpo-44394: Ensure libexpat is linked against libm (GH-28617) (GH-28620) (cherry picked from commit 6c1154b9de29e1c9cd3d05f5289543e5cff73895) Co-authored-by: Pablo Galindo Salgado <Pablogsal(a)gmail.com> Co-authored-by: Łukasz Langa <lukasz(a)langa.pl> files: M setup.py diff --git a/setup.py b/setup.py index 2d6b05682d2ba..57be07a7e0f82 100644 --- a/setup.py +++ b/setup.py @@ -1578,7 +1578,9 @@ def detect_expat_elementtree(self): ('XML_POOR_ENTROPY', '1'), ] extra_compile_args = [] - expat_lib = [] + # bpo-44394: libexpat uses isnan() of math.h and needs linkage + # against the libm + expat_lib = ['m'] expat_sources = ['expat/xmlparse.c', 'expat/xmlrole.c', 'expat/xmltok.c']

1 0

[typo] s/libexpact/libexpat/ in setup.py (GH-28624)
by ambv 29 Sep '21

29 Sep '21

https://github.com/python/cpython/commit/bf5d1684a770af4e4d176bc6780874a4be… commit: bf5d1684a770af4e4d176bc6780874a4be168cac branch: main author: Łukasz Langa <lukasz(a)langa.pl> committer: ambv <lukasz(a)langa.pl> date: 2021-09-29T16:29:35+02:00 summary: [typo] s/libexpact/libexpat/ in setup.py (GH-28624) files: M setup.py diff --git a/setup.py b/setup.py index 9e71a223c0aab..6122430cd0431 100644 --- a/setup.py +++ b/setup.py @@ -1767,7 +1767,7 @@ def detect_expat_elementtree(self): ('XML_POOR_ENTROPY', '1'), ] extra_compile_args = [] - # bpo-44394: libexpact uses isnan() of math.h and needs linkage + # bpo-44394: libexpat uses isnan() of math.h and needs linkage # against the libm expat_lib = ['m'] expat_sources = ['expat/xmlparse.c',

1 0

[3.10] bpo-44394: Ensure libexpat is linked against libm (GH-28617) (GH-28621)
by ambv 29 Sep '21

29 Sep '21

https://github.com/python/cpython/commit/412ae8ab10734b72384c969181919cc4eb… commit: 412ae8ab10734b72384c969181919cc4eb154406 branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: ambv <lukasz(a)langa.pl> date: 2021-09-29T16:13:41+02:00 summary: [3.10] bpo-44394: Ensure libexpat is linked against libm (GH-28617) (GH-28621) * bpo-44394: Ensure libexpat is linked against libm (GH-28617) (cherry picked from commit 6c1154b9de29e1c9cd3d05f5289543e5cff73895) Co-authored-by: Pablo Galindo Salgado <Pablogsal(a)gmail.com> Co-authored-by: Łukasz Langa <lukasz(a)langa.pl> files: M setup.py diff --git a/setup.py b/setup.py index 3d250e7249d70..a6fcc12b84d0c 100644 --- a/setup.py +++ b/setup.py @@ -1765,7 +1765,9 @@ def detect_expat_elementtree(self): ('XML_POOR_ENTROPY', '1'), ] extra_compile_args = [] - expat_lib = [] + # bpo-44394: libexpat uses isnan() of math.h and needs linkage + # against the libm + expat_lib = ['m'] expat_sources = ['expat/xmlparse.c', 'expat/xmlrole.c', 'expat/xmltok.c']

1 0

[typo] Fix threading.Barrier comment that used confusing punctuation (GH-28623)
by ambv 29 Sep '21

29 Sep '21

https://github.com/python/cpython/commit/f1ca5d7f61594bf3627f0897b596877a07… commit: f1ca5d7f61594bf3627f0897b596877a0774c8e7 branch: main author: Łukasz Langa <lukasz(a)langa.pl> committer: ambv <lukasz(a)langa.pl> date: 2021-09-29T16:11:26+02:00 summary: [typo] Fix threading.Barrier comment that used confusing punctuation (GH-28623) Removed extra comma in comment that indicates state of a `Barrier` as it was confusing and breaking the flow while reading. Co-authored-by: Priyank <5903604+cpriyank(a)users.noreply.github.com> files: M Lib/threading.py diff --git a/Lib/threading.py b/Lib/threading.py index e9962d1661df6..2f473bf1b2c2b 100644 --- a/Lib/threading.py +++ b/Lib/threading.py @@ -649,7 +649,7 @@ def __init__(self, parties, action=None, timeout=None): self._action = action self._timeout = timeout self._parties = parties - self._state = 0 #0 filling, 1, draining, -1 resetting, -2 broken + self._state = 0 # 0 filling, 1 draining, -1 resetting, -2 broken self._count = 0 def __repr__(self):

1 0

bpo-45220: Avoid automatically selecting the Windows 11 SDK preview when building (GH-28393) (GH-28622)
by ambv 29 Sep '21

29 Sep '21

https://github.com/python/cpython/commit/456d6d9fefac828c19fc1b562f6301f009… commit: 456d6d9fefac828c19fc1b562f6301f00965fe59 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: ambv <lukasz(a)langa.pl> date: 2021-09-29T15:54:47+02:00 summary: bpo-45220: Avoid automatically selecting the Windows 11 SDK preview when building (GH-28393) (GH-28622) (cherry picked from commit f4b94b1f57827083990272b5f282aa1493ae2bf4) Co-authored-by: Steve Dower <steve.dower(a)python.org> files: A Misc/NEWS.d/next/Build/2021-09-16-18-00-43.bpo-45220.TgbkvW.rst M PCbuild/python.props diff --git a/Misc/NEWS.d/next/Build/2021-09-16-18-00-43.bpo-45220.TgbkvW.rst b/Misc/NEWS.d/next/Build/2021-09-16-18-00-43.bpo-45220.TgbkvW.rst new file mode 100644 index 0000000000000..8bbd634fa61a3 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2021-09-16-18-00-43.bpo-45220.TgbkvW.rst @@ -0,0 +1,3 @@ +Avoid building with the Windows 11 SDK previews automatically. This may be +overridden by setting the ``DefaultWindowsSDKVersion`` environment variable +before building. diff --git a/PCbuild/python.props b/PCbuild/python.props index 295b7293f9d7b..0d25e51126a71 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -106,6 +106,9 @@  <_RegistryVersion Condition="$(_RegistryVersion) != '' and !$(_RegistryVersion.EndsWith('.0'))">$(_RegistryVersion).0</_RegistryVersion> +  + <_RegistryVersion Condition="$([System.Version]::Parse($(_RegistryVersion))) >= $([System.Version]::Parse(`10.0.22000.0`))">10.0.19041.0</_RegistryVersion> +  <DefaultWindowsSDKVersion>10.0.10586.0</DefaultWindowsSDKVersion> <DefaultWindowsSDKVersion Condition="$([System.Version]::Parse($(_RegistryVersion))) > $([System.Version]::Parse($(DefaultWindowsSDKVersion)))">$(_RegistryVersion)</DefaultWindowsSDKVersion>

1 0

bpo-44394: Ensure libexpat is linked against libm (GH-28617)
by miss-islington 29 Sep '21

29 Sep '21

https://github.com/python/cpython/commit/fafa213870193cf79557588ae8f9a4af57… commit: fafa213870193cf79557588ae8f9a4af570fd6e3 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-09-29T06:47:56-07:00 summary: bpo-44394: Ensure libexpat is linked against libm (GH-28617) (cherry picked from commit 6c1154b9de29e1c9cd3d05f5289543e5cff73895) Co-authored-by: Pablo Galindo Salgado <Pablogsal(a)gmail.com> files: M setup.py diff --git a/setup.py b/setup.py index 54d4b942bd5af..2bb71dde18d37 100644 --- a/setup.py +++ b/setup.py @@ -1686,7 +1686,9 @@ def detect_expat_elementtree(self): ('XML_POOR_ENTROPY', '1'), ] extra_compile_args = [] - expat_lib = [] + # bpo-44394: libexpact uses isnan() of math.h and needs linkage + # against the libm + expat_lib = ['m'] expat_sources = ['expat/xmlparse.c', 'expat/xmlrole.c', 'expat/xmltok.c']

1 0

bpo-44394: Ensure libexpat is linked against libm (GH-28617)
by pablogsal 29 Sep '21

29 Sep '21

https://github.com/python/cpython/commit/6c1154b9de29e1c9cd3d05f5289543e5cf… commit: 6c1154b9de29e1c9cd3d05f5289543e5cff73895 branch: main author: Pablo Galindo Salgado <Pablogsal(a)gmail.com> committer: pablogsal <Pablogsal(a)gmail.com> date: 2021-09-29T14:18:33+01:00 summary: bpo-44394: Ensure libexpat is linked against libm (GH-28617) files: M setup.py diff --git a/setup.py b/setup.py index 9e411cb35e00b..9e71a223c0aab 100644 --- a/setup.py +++ b/setup.py @@ -1767,7 +1767,9 @@ def detect_expat_elementtree(self): ('XML_POOR_ENTROPY', '1'), ] extra_compile_args = [] - expat_lib = [] + # bpo-44394: libexpact uses isnan() of math.h and needs linkage + # against the libm + expat_lib = ['m'] expat_sources = ['expat/xmlparse.c', 'expat/xmlrole.c', 'expat/xmltok.c']

1 0

Move predispatch logic from DISPATCH macro to juts before switch. Reduces size of each opocde in interpreter. (GH-28475)
by pablogsal 29 Sep '21

29 Sep '21

https://github.com/python/cpython/commit/2be4c370c6bfe98a85aa01c5d9c333b804… commit: 2be4c370c6bfe98a85aa01c5d9c333b804d26197 branch: 3.10 author: Mark Shannon <mark(a)hotpy.org> committer: pablogsal <Pablogsal(a)gmail.com> date: 2021-09-29T13:16:13+01:00 summary: Move predispatch logic from DISPATCH macro to juts before switch. Reduces size of each opocde in interpreter. (GH-28475) files: M Python/ceval.c diff --git a/Python/ceval.c b/Python/ceval.c index 429ddb82bd66d..686250e1a8f94 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1297,12 +1297,6 @@ eval_frame_handle_pending(PyThreadState *tstate) #if USE_COMPUTED_GOTOS #define TARGET(op) op: TARGET_##op -#define DISPATCH_GOTO() goto *opcode_targets[opcode] -#else -#define TARGET(op) op -#define DISPATCH_GOTO() goto dispatch_opcode -#endif - #define DISPATCH() \ { \ if (trace_info.cframe.use_tracing OR_DTRACE_LINE OR_LLTRACE) { \ @@ -1310,8 +1304,13 @@ eval_frame_handle_pending(PyThreadState *tstate) } \ f->f_lasti = INSTR_OFFSET(); \ NEXTOPARG(); \ - DISPATCH_GOTO(); \ + goto *opcode_targets[opcode]; \ } +#else +#define TARGET(op) op +#define DISPATCH() goto predispatch; +#endif + #define CHECK_EVAL_BREAKER() \ if (_Py_atomic_load_relaxed(eval_breaker)) { \ @@ -1827,7 +1826,16 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag) } } #endif +#if USE_COMPUTED_GOTOS == 0 + goto dispatch_opcode; + predispatch: + if (trace_info.cframe.use_tracing OR_DTRACE_LINE OR_LLTRACE) { + goto tracing_dispatch; + } + f->f_lasti = INSTR_OFFSET(); + NEXTOPARG(); +#endif dispatch_opcode: #ifdef DYNAMIC_EXECUTION_PROFILE #ifdef DXPAIRS

1 0

Fix doctest doc examples for syntax errors (GH-28486)
by pablogsal 29 Sep '21

29 Sep '21

https://github.com/python/cpython/commit/f76889a88720b56c8174f26a20a8e676a4… commit: f76889a88720b56c8174f26a20a8e676a460c7a6 branch: main author: andrei kulakov <andrei.avk(a)gmail.com> committer: pablogsal <Pablogsal(a)gmail.com> date: 2021-09-29T12:44:43+01:00 summary: Fix doctest doc examples for syntax errors (GH-28486) * fix doctest doc examples for syntax errors * updated examples to use TypeErrors * fixed first sentence * unneeded comma files: M Doc/library/doctest.rst diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst index a77322f83acbd..0bbb640bea26b 100644 --- a/Doc/library/doctest.rst +++ b/Doc/library/doctest.rst @@ -485,25 +485,24 @@ Some details you should read once, but won't need to remember: .. index:: single: ^ (caret); marker -* For some :exc:`SyntaxError`\ s, Python displays the character position of the - syntax error, using a ``^`` marker:: +* For some exceptions, Python displays the position of the error using ``^`` + markers and tildes:: - >>> 1 1 + >>> 1 + None File "<stdin>", line 1 - 1 1 - ^ - SyntaxError: invalid syntax + 1 + None + ~~^~~~~~ + TypeError: unsupported operand type(s) for +: 'int' and 'NoneType' Since the lines showing the position of the error come before the exception type and detail, they are not checked by doctest. For example, the following test would pass, even though it puts the ``^`` marker in the wrong location:: - >>> 1 1 - Traceback (most recent call last): + >>> 1 + None File "<stdin>", line 1 - 1 1 - ^ - SyntaxError: invalid syntax + 1 + None + ^~~~~~~~ + TypeError: unsupported operand type(s) for +: 'int' and 'NoneType' .. _option-flags-and-directives:

1 0

bpo-45291: Explicitly set --libdir=lib when configure OpenSSL (GH-28566) (GH-28616)
by ambv 29 Sep '21

29 Sep '21

https://github.com/python/cpython/commit/02fdd73a19464bafe9e5f98ecd17fd0a63… commit: 02fdd73a19464bafe9e5f98ecd17fd0a634c3f20 branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: ambv <lukasz(a)langa.pl> date: 2021-09-29T13:41:27+02:00 summary: bpo-45291: Explicitly set --libdir=lib when configure OpenSSL (GH-28566) (GH-28616) (cherry picked from commit bc4cde40339dd372960f27401d8fdaa4dab0f469) Co-authored-by: zhanpon <pon.zhan(a)gmail.com> files: M Doc/using/unix.rst diff --git a/Doc/using/unix.rst b/Doc/using/unix.rst index 1d1fa8bd85d7e..0a1834453a0ee 100644 --- a/Doc/using/unix.rst +++ b/Doc/using/unix.rst @@ -162,6 +162,7 @@ Custom OpenSSL $ pushd openssl-VERSION $ ./config \ --prefix=/usr/local/custom-openssl \ + --libdir=lib \ --openssldir=/etc/ssl $ make -j1 depend $ make -j8

1 0