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

Fix bug #417212: "curses.newwin can return pads" by changing the Python 

newwin() wrapper to always return a window, and never a pad.  This makes
   the code match the documentation.
This commit is contained in:
Andrew M. Kuchling 2001-07-14 20:38:30 +00:00
parent 9eb27a89d8
commit 5a76c44181
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/_cursesmodule.c
View File

@ -2051,7 +2051,7 @@ static PyObject *
PyCurses_NewWindow(PyObject *self, PyObject *args) PyCurses_NewWindow(PyObject *self, PyObject *args)
{ {
WINDOW *win; WINDOW *win;
int nlines, ncols, begin_y, begin_x; int nlines, ncols, begin_y=0, begin_x=0;
PyCursesInitialised PyCursesInitialised
@ -2059,19 +2059,18 @@ PyCurses_NewWindow(PyObject *self, PyObject *args)
case 2: case 2:
if (!PyArg_Parse(args,"(ii);nlines,ncols",&nlines,&ncols)) if (!PyArg_Parse(args,"(ii);nlines,ncols",&nlines,&ncols))
return NULL; return NULL;
win = newpad(nlines, ncols);
break; break;
case 4: case 4:
if (!PyArg_Parse(args, "(iiii);nlines,ncols,begin_y,begin_x", if (!PyArg_Parse(args, "(iiii);nlines,ncols,begin_y,begin_x",
&nlines,&ncols,&begin_y,&begin_x)) &nlines,&ncols,&begin_y,&begin_x))
return NULL; return NULL;
win = newwin(nlines,ncols,begin_y,begin_x);
break; break;
default: default:
PyErr_SetString(PyExc_TypeError, "newwin requires 2 or 4 arguments"); PyErr_SetString(PyExc_TypeError, "newwin requires 2 or 4 arguments");
return NULL; return NULL;
} }
win = newwin(nlines,ncols,begin_y,begin_x);
if (win == NULL) { if (win == NULL) {
PyErr_SetString(PyCursesError, catchall_NULL); PyErr_SetString(PyCursesError, catchall_NULL);
return NULL; return NULL;