Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-43084: Return bool instead of int from curses.window.enclose() (GH-24398)

This commit is contained in:
Serhiy Storchaka 2021-04-05 16:50:24 +03:00 committed by GitHub
parent c8e5eb904e
commit b1dc1aacf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Doc/library/curses.rst
View File

@ -915,6 +915,9 @@ the following methods and attributes:
determining what subset of the screen windows enclose the location of a mouse determining what subset of the screen windows enclose the location of a mouse
event. event.
.. versionchanged:: 3.10
Previously it returned ``1`` or ``0`` instead of ``True`` or ``False``.
.. attribute:: window.encoding .. attribute:: window.encoding

13
Lib/test/test_curses.py
View File

@ -566,13 +566,12 @@ class TestCurses(unittest.TestCase):
@requires_curses_window_meth('enclose') @requires_curses_window_meth('enclose')
def test_enclose(self): def test_enclose(self):
win = curses.newwin(5, 15, 2, 5) win = curses.newwin(5, 15, 2, 5)
# TODO: Return bool instead of 1/0 self.assertIs(win.enclose(2, 5), True)
self.assertTrue(win.enclose(2, 5)) self.assertIs(win.enclose(1, 5), False)
self.assertFalse(win.enclose(1, 5)) self.assertIs(win.enclose(2, 4), False)
self.assertFalse(win.enclose(2, 4)) self.assertIs(win.enclose(6, 19), True)
self.assertTrue(win.enclose(6, 19)) self.assertIs(win.enclose(7, 19), False)
self.assertFalse(win.enclose(7, 19)) self.assertIs(win.enclose(6, 20), False)
self.assertFalse(win.enclose(6, 20))
def test_putwin(self): def test_putwin(self):
win = curses.newwin(5, 12, 1, 2) win = curses.newwin(5, 12, 1, 2)

2
Misc/NEWS.d/next/Library/2021-01-31-17-31-13.bpo-43084.i8nLpK.rst Normal file
View File

@ -0,0 +1,2 @@
:func:`curses.window.enclose` returns now ``True`` or ``False`` (as was
documented) instead of ``1`` or ``0``.

8
Modules/_cursesmodule.c
View File

@ -1343,7 +1343,7 @@ _curses_window_echochar_impl(PyCursesWindowObject *self, PyObject *ch,
#ifdef NCURSES_MOUSE_VERSION #ifdef NCURSES_MOUSE_VERSION
/*[clinic input] /*[clinic input]
_curses.window.enclose -> long _curses.window.enclose
y: int y: int
Y-coordinate. Y-coordinate.
@ -1354,11 +1354,11 @@ _curses.window.enclose -> long
Return True if the screen-relative coordinates are enclosed by the window. Return True if the screen-relative coordinates are enclosed by the window.
[clinic start generated code]*/ [clinic start generated code]*/
static long static PyObject *
_curses_window_enclose_impl(PyCursesWindowObject *self, int y, int x) _curses_window_enclose_impl(PyCursesWindowObject *self, int y, int x)
/*[clinic end generated code: output=5251c961cbe3df63 input=dfe1d9d4d05d8642]*/ /*[clinic end generated code: output=8679beef50502648 input=4fd3355d723f7bc9]*/
{ {
return wenclose(self->win, y, x); return PyBool_FromLong(wenclose(self->win, y, x));
} }
#endif #endif

11
Modules/clinic/_cursesmodule.c.h generated
View File

@ -689,7 +689,7 @@ PyDoc_STRVAR(_curses_window_enclose__doc__,
#define _CURSES_WINDOW_ENCLOSE_METHODDEF \ #define _CURSES_WINDOW_ENCLOSE_METHODDEF \
{"enclose", (PyCFunction)(void(*)(void))_curses_window_enclose, METH_FASTCALL, _curses_window_enclose__doc__}, {"enclose", (PyCFunction)(void(*)(void))_curses_window_enclose, METH_FASTCALL, _curses_window_enclose__doc__},
static long static PyObject *
_curses_window_enclose_impl(PyCursesWindowObject *self, int y, int x); _curses_window_enclose_impl(PyCursesWindowObject *self, int y, int x);
static PyObject * static PyObject *
@ -698,7 +698,6 @@ _curses_window_enclose(PyCursesWindowObject *self, PyObject *const *args, Py_ssi
PyObject *return_value = NULL; PyObject *return_value = NULL;
int y; int y;
int x; int x;
long _return_value;
if (!_PyArg_CheckPositional("enclose", nargs, 2, 2)) { if (!_PyArg_CheckPositional("enclose", nargs, 2, 2)) {
goto exit; goto exit;
@ -711,11 +710,7 @@ _curses_window_enclose(PyCursesWindowObject *self, PyObject *const *args, Py_ssi
if (x == -1 && PyErr_Occurred()) { if (x == -1 && PyErr_Occurred()) {
goto exit; goto exit;
} }
_return_value = _curses_window_enclose_impl(self, y, x); return_value = _curses_window_enclose_impl(self, y, x);
if ((_return_value == -1) && PyErr_Occurred()) {
goto exit;
}
return_value = PyLong_FromLong(_return_value);
exit: exit:
return return_value; return return_value;
@ -4289,4 +4284,4 @@ _curses_has_extended_color_support(PyObject *module, PyObject *Py_UNUSED(ignored
#ifndef _CURSES_USE_DEFAULT_COLORS_METHODDEF #ifndef _CURSES_USE_DEFAULT_COLORS_METHODDEF
#define _CURSES_USE_DEFAULT_COLORS_METHODDEF #define _CURSES_USE_DEFAULT_COLORS_METHODDEF
#endif /* !defined(_CURSES_USE_DEFAULT_COLORS_METHODDEF) */ #endif /* !defined(_CURSES_USE_DEFAULT_COLORS_METHODDEF) */
/*[clinic end generated code: output=ae6559aa61200289 input=a9049054013a1b77]*/ /*[clinic end generated code: output=9efc9943a3ac3741 input=a9049054013a1b77]*/