Mask the color pair in curses_getcchar() and move the new tests

getcchar() is the one place that reads the pair out of a cell, so the mask
belongs there. inch() no longer needs its own. The complexchar checks move
to test_complexchar.

Author: fedonman

Lib/test/test_curses.py

@@ -537,6 +537,14 @@ def test_complexchar(self):
         self.assertEqual(str(cc), 'z')
         self.assertEqual(cc.attr, 0)
         self.assertEqual(cc.pair, 0)
+        # attr never carries the color pair, not even a pair that does not fit
+        # in a color_pair() value.
+        self.assertEqual(curses.complexchar('A', 0, 1).attr, 0)
+        self.assertEqual(curses.complexchar('A', 0, 300).attr, 0)
+        self.assertEqual(curses.complexchar('A', curses.A_BOLD, 1).attr,
+                         curses.A_BOLD)
+        self.assertEqual(curses.complexchar('A', 0, 1).pair, 1)
+        self.assertEqual(curses.complexchar('A', 0, 300).pair, 300)
         # Immutable rendition.
         self.assertRaises(AttributeError, setattr, cc, 'attr', 1)
         self.assertRaises(AttributeError, setattr, cc, 'pair', 1)
@@ -595,12 +603,6 @@ def test_in_wch_color(self):
         self.assertEqual(cc.attr, curses.A_BOLD)
         self.assertEqual(cc.pair, 1)
         self.assertEqual(curses.complexchar('A', 0, 1).pair, 1)
-        # attr never carries the color pair, not even a pair that does not fit
-        # in a color_pair() value.
-        self.assertEqual(curses.complexchar('A', 0, 1).attr, 0)
-        self.assertEqual(curses.complexchar('A', 0, 300).attr, 0)
-        self.assertEqual(curses.complexchar('A', curses.A_BOLD, 1).attr,
-                         curses.A_BOLD)
 
     def test_getbkgrnd(self):
         # getbkgrnd() returns the background as a complexchar (getbkgd() can

Modules/_cursesmodule.c

@@ -798,6 +798,9 @@ curses_getcchar(const cchar_t *wcval, wchar_t *wstr, attr_t *attrs, int *pair)
         *pair = spair;
     }
 #endif
+    if (rtn != ERR) {
+        *attrs &= ~(attr_t)A_COLOR;
+    }
     return rtn;
 }
 
@@ -884,7 +887,6 @@ curses_cell_attr_pair(cursesmodule_state *state, const curses_cell_t *cell,
         PyErr_SetString(state->error, "getcchar() returned ERR");
         return -1;
     }
-    *attr &= ~(attr_t)A_COLOR;
     return 0;
 #else
     *attr = *cell & A_ATTRIBUTES & ~(attr_t)A_COLOR;
@@ -3675,7 +3677,7 @@ _curses_window_inch_impl(PyCursesWindowObject *self, int group_right_1,
             byte = 0;
         }
     }
-    rtn = (chtype)byte | (attrs & ~(attr_t)A_COLOR) | COLOR_PAIR(pair);
+    rtn = (chtype)byte | attrs | COLOR_PAIR(pair);
 #else
     if (!group_right_1) {
         rtn = winch(self->win);