Mailman 3 March 2021 - Python-checkins

bpo-42603: Use pkg-config to get TCL/TK paths for tkinter. (GH-23721)
by ned-deily March 1, 2021

March 1, 2021

https://github.com/python/cpython/commit/d20279494a3a311c7aefa313174c45d32a… commit: d20279494a3a311c7aefa313174c45d32aa7f5d1 branch: master author: Manolis Stamatogiannakis <mstamat(a)gmail.com> committer: ned-deily <nad(a)python.org> date: 2021-02-28T22:29:57-05:00 summary: bpo-42603: Use pkg-config to get TCL/TK paths for tkinter. (GH-23721) files: A Misc/NEWS.d/next/Build/2020-12-08-19-25-20.bpo-42603.mXs2dB.rst M configure M configure.ac M setup.py diff --git a/Misc/NEWS.d/… [View More]next/Build/2020-12-08-19-25-20.bpo-42603.mXs2dB.rst b/Misc/NEWS.d/next/Build/2020-12-08-19-25-20.bpo-42603.mXs2dB.rst new file mode 100644 index 0000000000000..eea77e01fa7bb --- /dev/null +++ b/Misc/NEWS.d/next/Build/2020-12-08-19-25-20.bpo-42603.mXs2dB.rst @@ -0,0 +1,7 @@ +Make configure script use pkg-config to detect the location of Tcl/Tk +headers and libraries, used to build tkinter. + +On macOS, a Tcl/Tk configuration provided by pkg-config will be preferred +over Tcl/Tk frameworks installed in ``/{System/,}Library/Frameworks``. +If both exist and the latter is preferred, the appropriate +``--with-tcltk-*`` configuration options need to be explicitly set. diff --git a/configure b/configure index 8c948250e41e4..2d5a61e71eb79 100755 --- a/configure +++ b/configure @@ -10714,8 +10714,13 @@ then then as_fn_error $? "use both --with-tcltk-includes='...' and --with-tcltk-libs='...' or neither" "$LINENO" 5 fi - TCLTK_INCLUDES="" - TCLTK_LIBS="" + if test -n "$PKG_CONFIG" && "$PKG_CONFIG" --exists tcl tk; then + TCLTK_INCLUDES="`"$PKG_CONFIG" tcl tk --cflags-only-I 2>/dev/null`" + TCLTK_LIBS="`"$PKG_CONFIG" tcl tk --libs 2>/dev/null`" + else + TCLTK_INCLUDES="" + TCLTK_LIBS="" + fi else TCLTK_INCLUDES="$with_tcltk_includes" TCLTK_LIBS="$with_tcltk_libs" diff --git a/configure.ac b/configure.ac index 29957935e9b2a..e71d74c872b70 100644 --- a/configure.ac +++ b/configure.ac @@ -3157,8 +3157,13 @@ then then AC_MSG_ERROR([use both --with-tcltk-includes='...' and --with-tcltk-libs='...' or neither]) fi - TCLTK_INCLUDES="" - TCLTK_LIBS="" + if test -n "$PKG_CONFIG" && "$PKG_CONFIG" --exists tcl tk; then + TCLTK_INCLUDES="`"$PKG_CONFIG" tcl tk --cflags-only-I 2>/dev/null`" + TCLTK_LIBS="`"$PKG_CONFIG" tcl tk --libs 2>/dev/null`" + else + TCLTK_INCLUDES="" + TCLTK_LIBS="" + fi else TCLTK_INCLUDES="$with_tcltk_includes" TCLTK_LIBS="$with_tcltk_libs" diff --git a/setup.py b/setup.py index 0c4947fd762ee..554772217785d 100644 --- a/setup.py +++ b/setup.py @@ -1879,18 +1879,34 @@ def detect_modules(self): self.add(Extension('xxlimited', ['xxlimited.c'])) self.add(Extension('xxlimited_35', ['xxlimited_35.c'])) - def detect_tkinter_explicitly(self): - # Build _tkinter using explicit locations for Tcl/Tk. + def detect_tkinter_fromenv(self): + # Build _tkinter using the Tcl/Tk locations specified by + # the _TCLTK_INCLUDES and _TCLTK_LIBS environment variables. + # This method is meant to be invoked by detect_tkinter(). # - # This is enabled when both arguments are given to ./configure: + # The variables can be set via one of the following ways. # + # - Automatically, at configuration time, by using pkg-config. + # The tool is called by the configure script. + # Additional pkg-config configuration paths can be set via the + # PKG_CONFIG_PATH environment variable. + # + # PKG_CONFIG_PATH=".../lib/pkgconfig" ./configure ... + # + # - Explicitly, at configuration time by setting both + # --with-tcltk-includes and --with-tcltk-libs. + # + # ./configure ... \ # --with-tcltk-includes="-I/path/to/tclincludes \ # -I/path/to/tkincludes" # --with-tcltk-libs="-L/path/to/tcllibs -ltclm.n \ # -L/path/to/tklibs -ltkm.n" # - # These values can also be specified or overridden via make: - # make TCLTK_INCLUDES="..." TCLTK_LIBS="..." + # - Explicitly, at compile time, by passing TCLTK_INCLUDES and + # TCLTK_LIBS to the make target. + # This will override any configuration-time option. + # + # make TCLTK_INCLUDES="..." TCLTK_LIBS="..." # # This can be useful for building and testing tkinter with multiple # versions of Tcl/Tk. Note that a build of Tk depends on a particular @@ -1914,6 +1930,7 @@ def detect_tkinter_explicitly(self): def detect_tkinter_darwin(self): # Build default _tkinter on macOS using Tcl and Tk frameworks. + # This method is meant to be invoked by detect_tkinter(). # # The macOS native Tk (AKA Aqua Tk) and Tcl are most commonly # built and installed as macOS framework bundles. However, @@ -1932,16 +1949,20 @@ def detect_tkinter_darwin(self): # search only the SDK's /Library/Frameworks (normally empty) # and /System/Library/Frameworks. # - # Any other use case should be able to be handled explicitly by - # using the options described above in detect_tkinter_explicitly(). - # In particular it would be good to handle here the case where + # Any other use cases are handled either by detect_tkinter_fromenv(), + # or detect_tkinter(). The former handles non-standard locations of + # Tcl/Tk, defined via the _TCLTK_INCLUDES and _TCLTK_LIBS environment + # variables. The latter handles any Tcl/Tk versions installed in + # standard Unix directories. + # + # It would be desirable to also handle here the case where # you want to build and link with a framework build of Tcl and Tk # that is not in /Library/Frameworks, say, in your private # $HOME/Library/Frameworks directory or elsewhere. It turns # out to be difficult to make that work automatically here # without bringing into play more tools and magic. That case # can be handled using a recipe with the right arguments - # to detect_tkinter_explicitly(). + # to detect_tkinter_fromenv(). # # Note also that the fallback case here is to try to use the # Apple-supplied Tcl and Tk frameworks in /System/Library but @@ -2041,12 +2062,17 @@ def detect_tkinter_darwin(self): def detect_tkinter(self): # The _tkinter module. + # + # Detection of Tcl/Tk is attempted in the following order: + # - Through environment variables. + # - Platform specific detection of Tcl/Tk (currently only macOS). + # - Search of various standard Unix header/library paths. + # + # Detection stops at the first successful method. - # Check whether --with-tcltk-includes and --with-tcltk-libs were - # configured or passed into the make target. If so, use these values - # to build tkinter and bypass the searches for Tcl and TK in standard - # locations. - if self.detect_tkinter_explicitly(): + # Check for Tcl and Tk at the locations indicated by _TCLTK_INCLUDES + # and _TCLTK_LIBS environment variables. + if self.detect_tkinter_fromenv(): return True # Rather than complicate the code below, detecting and building [View Less]

1 0

closes bpo-43266: Improve array formatting. (GH-24573) (GH-24585)
by willingc March 1, 2021

March 1, 2021

https://github.com/python/cpython/commit/4ebd637dde7d7e56b18926d2a70657abca… commit: 4ebd637dde7d7e56b18926d2a70657abcac73df0 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: willingc <carolcode(a)willingconsulting.com> date: 2021-02-28T18:20:08-08:00 summary: closes bpo-43266: Improve array formatting. (GH-24573) (GH-24585) (cherry picked from commit 2d3e463e4a5aa109d1c15c86f9631580f5ef7a7e) Co-authored-by: Erlend Egeberg … [View More]

1 0

bpo-36346: Document removal schedule of deprecate APIs (GH-20879) (#24626)
by willingc March 1, 2021

March 1, 2021

https://github.com/python/cpython/commit/346afeb159a5a8b2e260d3de740019b643… commit: 346afeb159a5a8b2e260d3de740019b64352660e branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: willingc <carolcode(a)willingconsulting.com> date: 2021-02-28T18:14:33-08:00 summary: bpo-36346: Document removal schedule of deprecate APIs (GH-20879) (#24626) We will remove wstr cache in Python 3.12. See PEP 623. (cherry picked from commit … [View More]2d6f2eed14ff5d89155b52771cc8ef957e8145b4) Co-authored-by: Inada Naoki <songofacandy(a)gmail.com> Co-authored-by: Inada Naoki <songofacandy(a)gmail.com> files: A Misc/NEWS.d/next/Documentation/2020-06-15-10-45-45.bpo-36346.H0sS_i.rst M Doc/c-api/arg.rst M Doc/c-api/unicode.rst diff --git a/Doc/c-api/arg.rst b/Doc/c-api/arg.rst index a187a8fb81437..7a3188009cf95 100644 --- a/Doc/c-api/arg.rst +++ b/Doc/c-api/arg.rst @@ -151,7 +151,7 @@ which disallows mutable objects such as :class:`bytearray`. Previously, :exc:`TypeError` was raised when embedded null code points were encountered in the Python string. - .. deprecated-removed:: 3.3 4.0 + .. deprecated-removed:: 3.3 3.12 Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using :c:func:`PyUnicode_AsWideCharString`. @@ -160,7 +160,7 @@ which disallows mutable objects such as :class:`bytearray`. Unicode data buffer, the second one its length. This variant allows null code points. - .. deprecated-removed:: 3.3 4.0 + .. deprecated-removed:: 3.3 3.12 Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using :c:func:`PyUnicode_AsWideCharString`. @@ -168,7 +168,7 @@ which disallows mutable objects such as :class:`bytearray`. Like ``u``, but the Python object may also be ``None``, in which case the :c:type:`Py_UNICODE` pointer is set to ``NULL``. - .. deprecated-removed:: 3.3 4.0 + .. deprecated-removed:: 3.3 3.12 Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using :c:func:`PyUnicode_AsWideCharString`. @@ -176,7 +176,7 @@ which disallows mutable objects such as :class:`bytearray`. Like ``u#``, but the Python object may also be ``None``, in which case the :c:type:`Py_UNICODE` pointer is set to ``NULL``. - .. deprecated-removed:: 3.3 4.0 + .. deprecated-removed:: 3.3 3.12 Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using :c:func:`PyUnicode_AsWideCharString`. diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst index 9b68c31e541ae..bb5091ce425e6 100644 --- a/Doc/c-api/unicode.rst +++ b/Doc/c-api/unicode.rst @@ -19,8 +19,7 @@ points must be below 1114112 (which is the full Unicode range). :c:type:`Py_UNICODE*` and UTF-8 representations are created on demand and cached in the Unicode object. The :c:type:`Py_UNICODE*` representation is deprecated -and inefficient; it should be avoided in performance- or memory-sensitive -situations. +and inefficient. Due to the transition between the old APIs and the new APIs, Unicode objects can internally be in two states depending on how they were created: @@ -429,7 +428,7 @@ APIs: If *u* is ``NULL``, this function behaves like :c:func:`PyUnicode_FromUnicode` with the buffer set to ``NULL``. This usage is deprecated in favor of - :c:func:`PyUnicode_New`. + :c:func:`PyUnicode_New`, and will be removed in Python 3.12. .. c:function:: PyObject *PyUnicode_FromString(const char *u) @@ -671,7 +670,7 @@ APIs: Deprecated Py_UNICODE APIs """""""""""""""""""""""""" -.. deprecated-removed:: 3.3 4.0 +.. deprecated-removed:: 3.3 3.12 These API functions are deprecated with the implementation of :pep:`393`. Extension modules can continue using them, as they will not be removed in Python diff --git a/Misc/NEWS.d/next/Documentation/2020-06-15-10-45-45.bpo-36346.H0sS_i.rst b/Misc/NEWS.d/next/Documentation/2020-06-15-10-45-45.bpo-36346.H0sS_i.rst new file mode 100644 index 0000000000000..b737e125f8371 --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2020-06-15-10-45-45.bpo-36346.H0sS_i.rst @@ -0,0 +1,2 @@ +Update some deprecated unicode APIs which are documented as "will be removed +in 4.0" to "3.12". See :pep:`623` for detail. [View Less]

1 0

bpo-42128: Add documentation for the new match-based AST nodes (GH-24673)
by willingc March 1, 2021

March 1, 2021

https://github.com/python/cpython/commit/a8e2615aa885a121b8cf8e9cd076962073… commit: a8e2615aa885a121b8cf8e9cd07696207356a25a branch: master author: Pablo Galindo <Pablogsal(a)gmail.com> committer: willingc <carolcode(a)willingconsulting.com> date: 2021-02-28T18:08:37-08:00 summary: bpo-42128: Add documentation for the new match-based AST nodes (GH-24673) * bpo-42128: Add documentation for the new match-based AST nodes * Update Doc/library/ast.rst Co-authored-by: Carol Willing &… [View More]lt;carolcode(a)willingconsulting.com> * Fix trailing whitespace Co-authored-by: Carol Willing <carolcode(a)willingconsulting.com> files: M Doc/library/ast.rst diff --git a/Doc/library/ast.rst b/Doc/library/ast.rst index 9149a53e0dca8..aaedfbe1b9c01 100644 --- a/Doc/library/ast.rst +++ b/Doc/library/ast.rst @@ -1240,6 +1240,128 @@ Control flow type_ignores=[]) +.. class:: Match(subject, cases) + + A ``match`` statement. ``subject`` holds the subject of the match (the object + that is being matched against the cases) and ``cases`` contains an iterable of + :class:`match_case` nodes with the different cases. + + +.. class:: match_case(context_expr, optional_vars) + + A single case pattern in a ``match`` statement. ``pattern`` contains the + match pattern that will be used to match the subject against. Notice that + the meaning of the :class:`AST` nodes in this attribute have a different + meaning than in other places, as they represent patterns to match against. + The ``guard`` attribute contains an expression that will be evaluated if + the pattern matches the subject. If the pattern matches and the ``guard`` condition + is truthy, the body of the case shall be executed. ``body`` contains a list + of nodes to execute if the guard is truthy. + + .. doctest:: + + >>> print(ast.dump(ast.parse(""" + ... match x: + ... case [x] if x>0: + ... ... + ... case tuple(): + ... ... + ... """), indent=4)) + Module( + body=[ + Match( + subject=Name(id='x', ctx=Load()), + cases=[ + match_case( + pattern=List( + elts=[ + Name(id='x', ctx=Store())], + ctx=Load()), + guard=Compare( + left=Name(id='x', ctx=Load()), + ops=[ + Gt()], + comparators=[ + Constant(value=0)]), + body=[ + Expr( + value=Constant(value=Ellipsis))]), + match_case( + pattern=Call( + func=Name(id='tuple', ctx=Load()), + args=[], + keywords=[]), + body=[ + Expr( + value=Constant(value=Ellipsis))])])], + type_ignores=[]) + +.. class:: MatchAs(pattern, name) + + A match "as-pattern". The as-pattern matches whatever pattern is on its + left-hand side, but also binds the value to a name. ``pattern`` contains + the match pattern that will be used to match the subject agsinst. The ``name`` + attribute contains the name that will be binded if the pattern is successful. + + .. doctest:: + + >>> print(ast.dump(ast.parse(""" + ... match x: + ... case [x] as y: + ... ... + ... """), indent=4)) + Module( + body=[ + Match( + subject=Name(id='x', ctx=Load()), + cases=[ + match_case( + pattern=MatchAs( + pattern=List( + elts=[ + Name(id='x', ctx=Store())], + ctx=Load()), + name='y'), + body=[ + Expr( + value=Constant(value=Ellipsis))])])], + type_ignores=[]) + + +.. class:: MatchOr(patterns) + + A match "or-pattern". An or-pattern matches each of its subpatterns in turn + to the subject, until one succeeds. The or-pattern is then deemed to + succeed. If none of the subpatterns succeed the or-pattern fails. The + ``patterns`` attribute contains a list of match patterns nodes that will be + matched against the subject. + + .. doctest:: + + >>> print(ast.dump(ast.parse(""" + ... match x: + ... case [x] | (y): + ... ... + ... """), indent=4)) + Module( + body=[ + Match( + subject=Name(id='x', ctx=Load()), + cases=[ + match_case( + pattern=MatchOr( + patterns=[ + List( + elts=[ + Name(id='x', ctx=Store())], + ctx=Load()), + Name(id='y', ctx=Store())]), + body=[ + Expr( + value=Constant(value=Ellipsis))])])], + type_ignores=[]) + + Function and class definitions ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ [View Less]

1 0