From 040f9f9c48f4e74e851d850275aa9e050a04d0c6 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Fri, 10 Dec 2021 03:21:19 -0800 Subject: [PATCH] bpo-46000: Improve NetBSD curses compatibility (GH-29947) (GH-30023) (cherry picked from commit 2fb797e93c6bbd44dfcbe23f63acfa240a87e48a) Co-authored-by: Thomas Klausner --- .../2021-12-07-11-42-44.bpo-46000.v_ru3k.rst | 1 + Modules/_cursesmodule.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2021-12-07-11-42-44.bpo-46000.v_ru3k.rst diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-12-07-11-42-44.bpo-46000.v_ru3k.rst b/Misc/NEWS.d/next/Core and Builtins/2021-12-07-11-42-44.bpo-46000.v_ru3k.rst new file mode 100644 index 000000000000..68e4bfa9e77b --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2021-12-07-11-42-44.bpo-46000.v_ru3k.rst @@ -0,0 +1 @@ +Improve compatibility of the :mod:`curses` module with NetBSD curses. diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c index a32cc4b88435..f95677cee575 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -1077,8 +1077,8 @@ PyCursesWindow_ChgAt(PyCursesWindowObject *self, PyObject *args) return NULL; } - color = (short)((attr >> 8) & 0xff); - attr = attr - (color << 8); + color = (short) PAIR_NUMBER(attr); + attr = attr & A_ATTRIBUTES; if (use_xy) { rtn = mvwchgat(self->win,y,x,num,attr,color,NULL); -- 2.47.3