Skip to content

Commit e1a1e32

Browse files
committed
gh-111460: restore ncurses widechar support on macOS
1 parent 30ec968 commit e1a1e32

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed
Lines changed: 3 additions & 0 deletions
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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6290,9 +6290,11 @@ dnl remove _XOPEN_SOURCE macro from curses cflags. pyconfig.h sets
62906290
dnl the macro to 700.
62916291
CURSES_CFLAGS=$(echo $CURSES_CFLAGS | sed 's/-D_XOPEN_SOURCE=600//g')
62926292

6293-
if test "$have_curses" = no -a "$ac_sys_system" = "Darwin"; then
6293+
if test "$have_curses" != no -a "$ac_sys_system" = "Darwin"; then
62946294
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.
62966298
dnl There should also be a libpanelw.
62976299
dnl _XOPEN_SOURCE defines are usually excluded for macOS, but we need
62986300
dnl _XOPEN_SOURCE_EXTENDED here for ncurses wide char support.

0 commit comments

Comments
 (0)