Commit e1a1e32
committed
pythongh-111460: restore ncurses widechar support on macOS
1 parent 30ec968 commit e1a1e32
3 files changed
Lines changed: 8 additions & 3 deletions
File tree
- Misc/NEWS.d/next/Library
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,3 @@ | |||
| 1 | + :mod:`curses`: restore wide character support (including | ||
| 2 | + :func:`curses.unget_wch` and :meth:`~curses.window.get_wch`) on macOS, which | ||
| 3 | + was unavailable due to a regression in Python 3.12. | ||
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -6290,9 +6290,11 @@ dnl remove _XOPEN_SOURCE macro from curses cflags. pyconfig.h sets | |||
| 6290 | 6290 | dnl the macro to 700. | |
| 6291 | 6291 | CURSES_CFLAGS=$(echo $CURSES_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//g') | |
| 6292 | 6292 | ||
| 6293 | - if test "$have_curses" = no -a "$ac_sys_system" = "Darwin"; then | ||
| 6293 | + if test "$have_curses" != no -a "$ac_sys_system" = "Darwin"; then | ||
| 6294 | 6294 | dnl On macOS, there is no separate /usr/lib/libncursesw nor libpanelw. | |
| 6295 | - dnl If we are here, we found a locally-supplied version of libncursesw. | ||
| 6295 | + dnl System-supplied ncurses combines libncurses/libpanel and supports wide | ||
| 6296 | + dnl characters, so we can use it like ncursesw. | ||
| 6297 | + dnl If a locally-supplied version of libncursesw is found, we will use that. | ||
| 6296 | 6298 | dnl There should also be a libpanelw. | |
| 6297 | 6299 | dnl _XOPEN_SOURCE defines are usually excluded for macOS, but we need | |
| 6298 | 6300 | dnl _XOPEN_SOURCE_EXTENDED here for ncurses wide char support. | |
0 commit comments