From 37b9a5df9331fa76cdfc9d4fc05765c1136118ab Mon Sep 17 00:00:00 2001 From: Mendel Feygelson Date: Wed, 6 Aug 2025 16:51:59 -0500 Subject: [PATCH 1/3] Docs: Use the correct example module in warnings.rst (#137402) --- Doc/library/warnings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/library/warnings.rst b/Doc/library/warnings.rst index 00bafd1be4bd0c..05e061cc697778 100644 --- a/Doc/library/warnings.rst +++ b/Doc/library/warnings.rst @@ -458,7 +458,7 @@ Available Functions lower.one_way(**kw) This makes the warning refer to both the ``example.lower.one_way()`` and - ``package.higher.another_way()`` call sites only from calling code living + ``example.higher.another_way()`` call sites only from calling code living outside of ``example`` package. *source*, if supplied, is the destroyed object which emitted a From c653fba0167bfafa69f9726c7d6dc1680dcca825 Mon Sep 17 00:00:00 2001 From: Greg Stein Date: Wed, 6 Aug 2025 16:58:24 -0500 Subject: [PATCH 2/3] Docs: Small clarity change for ``except*`` (#121073) Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com> --- Doc/reference/compound_stmts.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst index 7ac4d8587ce7d5..4e49a49c08167a 100644 --- a/Doc/reference/compound_stmts.rst +++ b/Doc/reference/compound_stmts.rst @@ -386,7 +386,7 @@ have ambiguous semantics. It is not possible to mix :keyword:`except` and :keyword:`!except*` in the same :keyword:`try`. -:keyword:`break`, :keyword:`continue` and :keyword:`return` +The :keyword:`break`, :keyword:`continue`, and :keyword:`return` statements cannot appear in an :keyword:`!except*` clause. From 3000594e929aea768fe0dd2437e0722ecfa2dbdc Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 6 Aug 2025 17:05:41 -0500 Subject: [PATCH 3/3] gh-84683: Check `/share/zoneinfo` for zoneinfo files on Windows (GH-28495) --- Lib/sysconfig/__init__.py | 8 +++++++- .../Library/2021-09-21-17-17-29.gh-issue-84683.wDSRsG.rst | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2021-09-21-17-17-29.gh-issue-84683.wDSRsG.rst diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py index 49e0986517ce97..c583b74ce54fc6 100644 --- a/Lib/sysconfig/__init__.py +++ b/Lib/sysconfig/__init__.py @@ -412,7 +412,13 @@ def _init_non_posix(vars): vars['EXE'] = '.exe' vars['VERSION'] = _PY_VERSION_SHORT_NO_DOT vars['BINDIR'] = os.path.dirname(_safe_realpath(sys.executable)) - vars['TZPATH'] = '' + # No standard path exists on Windows for this, but we'll check + # whether someone is imitating a POSIX-like layout + check_tzpath = os.path.join(vars['prefix'], 'share', 'zoneinfo') + if os.path.exists(check_tzpath): + vars['TZPATH'] = check_tzpath + else: + vars['TZPATH'] = '' # # public APIs diff --git a/Misc/NEWS.d/next/Library/2021-09-21-17-17-29.gh-issue-84683.wDSRsG.rst b/Misc/NEWS.d/next/Library/2021-09-21-17-17-29.gh-issue-84683.wDSRsG.rst new file mode 100644 index 00000000000000..66f76bda6ad7a7 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-09-21-17-17-29.gh-issue-84683.wDSRsG.rst @@ -0,0 +1 @@ +:mod:`zoneinfo`: Check in ``/share/zoneinfo`` for data files on Windows