Skip to content

Commit d34650e

Browse files
[3.12] gh-111460: Restore ncurses widechar support on macOS (GH-111878) (gh-112034)
gh-111460: Restore ncurses widechar support on macOS (GH-111878) (cherry picked from commit d2f305d) Co-authored-by: Davide Rizzo <[email protected]>
1 parent 02fdb42 commit d34650e

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed
Original file line numberDiff line numberDiff 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.

configure

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

+4-2
Original file line numberDiff line numberDiff line change
@@ -6439,9 +6439,11 @@ dnl remove _XOPEN_SOURCE macro from curses cflags. pyconfig.h sets
64396439
dnl the macro to 700.
64406440
CURSES_CFLAGS=$(echo $CURSES_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//g')
64416441

6442-
if test "$have_curses" = no -a "$ac_sys_system" = "Darwin"; then
6442+
if test "$have_curses" != no -a "$ac_sys_system" = "Darwin"; then
64436443
dnl On macOS, there is no separate /usr/lib/libncursesw nor libpanelw.
6444-
dnl If we are here, we found a locally-supplied version of libncursesw.
6444+
dnl System-supplied ncurses combines libncurses/libpanel and supports wide
6445+
dnl characters, so we can use it like ncursesw.
6446+
dnl If a locally-supplied version of libncursesw is found, we will use that.
64456447
dnl There should also be a libpanelw.
64466448
dnl _XOPEN_SOURCE defines are usually excluded for macOS, but we need
64476449
dnl _XOPEN_SOURCE_EXTENDED here for ncurses wide char support.

0 commit comments

Comments
 (0)