1e8671d641
We are pleased to announce the release of Python 2.4.4 (FINAL), a bugfix release of Python 2.4, on October 18, 2006. Important: 2.4.4 includes a security fix (PSF-2006-001) for the repr() of unicode strings in wide unicode builds (UCS-4) [does not affect pkgsrc] Python 2.4 is now in bugfix-only mode; no new features are being added. At least 80 bugs have been squished since Python 2.4.3, including a number of bugs and potential bugs found by with the Coverity and Klocwork static analysis tools. We'd like to offer our thanks to both these firms for making this available for open source projects - see their websites if you're interested.
86 lines
3.1 KiB
Text
86 lines
3.1 KiB
Text
$NetBSD: patch-ah,v 1.3 2007/06/08 14:16:16 wiz Exp $
|
|
|
|
--- Modules/_cursesmodule.c.orig 2006-09-27 19:17:32.000000000 +0000
|
|
+++ Modules/_cursesmodule.c
|
|
@@ -317,17 +317,9 @@ Window_OneArgNoReturnFunction(wattroff,
|
|
Window_OneArgNoReturnFunction(wattrset, attr_t, "l;attr")
|
|
Window_OneArgNoReturnFunction(clearok, int, "i;True(1) or False(0)")
|
|
Window_OneArgNoReturnFunction(idlok, int, "i;True(1) or False(0)")
|
|
-#if defined(__NetBSD__)
|
|
-Window_OneArgNoReturnVoidFunction(keypad, int, "i;True(1) or False(0)")
|
|
-#else
|
|
Window_OneArgNoReturnFunction(keypad, int, "i;True(1) or False(0)")
|
|
-#endif
|
|
Window_OneArgNoReturnFunction(leaveok, int, "i;True(1) or False(0)")
|
|
-#if defined(__NetBSD__)
|
|
-Window_OneArgNoReturnVoidFunction(nodelay, int, "i;True(1) or False(0)")
|
|
-#else
|
|
Window_OneArgNoReturnFunction(nodelay, int, "i;True(1) or False(0)")
|
|
-#endif
|
|
Window_OneArgNoReturnFunction(notimeout, int, "i;True(1) or False(0)")
|
|
Window_OneArgNoReturnFunction(scrollok, int, "i;True(1) or False(0)")
|
|
Window_OneArgNoReturnFunction(winsdelln, int, "i;nlines")
|
|
@@ -788,11 +780,7 @@ PyCursesWindow_GetKey(PyCursesWindowObje
|
|
} else if (rtn<=255)
|
|
return Py_BuildValue("c", rtn);
|
|
else
|
|
-#if defined(__NetBSD__)
|
|
- return PyString_FromString(unctrl(rtn));
|
|
-#else
|
|
return PyString_FromString((char *)keyname(rtn));
|
|
-#endif
|
|
}
|
|
|
|
static PyObject *
|
|
@@ -1953,7 +1941,6 @@ PyCurses_IntrFlush(PyObject *self, PyObj
|
|
return PyCursesCheckERR(intrflush(NULL,ch), "intrflush");
|
|
}
|
|
|
|
-#if !defined(__NetBSD__)
|
|
static PyObject *
|
|
PyCurses_KeyName(PyObject *self, PyObject *args)
|
|
{
|
|
@@ -1972,7 +1959,6 @@ PyCurses_KeyName(PyObject *self, PyObjec
|
|
|
|
return PyString_FromString((knp == NULL) ? "" : (char *)knp);
|
|
}
|
|
-#endif
|
|
|
|
static PyObject *
|
|
PyCurses_KillChar(PyObject *self)
|
|
@@ -2421,9 +2407,7 @@ static PyMethodDef PyCurses_methods[] =
|
|
{"initscr", (PyCFunction)PyCurses_InitScr, METH_NOARGS},
|
|
{"intrflush", (PyCFunction)PyCurses_IntrFlush, METH_VARARGS},
|
|
{"isendwin", (PyCFunction)PyCurses_isendwin, METH_NOARGS},
|
|
-#if !defined(__NetBSD__)
|
|
{"keyname", (PyCFunction)PyCurses_KeyName, METH_VARARGS},
|
|
-#endif
|
|
{"killchar", (PyCFunction)PyCurses_KillChar, METH_NOARGS},
|
|
{"longname", (PyCFunction)PyCurses_longname, METH_NOARGS},
|
|
{"meta", (PyCFunction)PyCurses_Meta, METH_VARARGS},
|
|
@@ -2526,9 +2510,7 @@ init_curses(void)
|
|
SetDictInt("A_DIM", A_DIM);
|
|
SetDictInt("A_BOLD", A_BOLD);
|
|
SetDictInt("A_ALTCHARSET", A_ALTCHARSET);
|
|
-#if !defined(__NetBSD__)
|
|
SetDictInt("A_INVIS", A_INVIS);
|
|
-#endif
|
|
SetDictInt("A_PROTECT", A_PROTECT);
|
|
SetDictInt("A_CHARTEXT", A_CHARTEXT);
|
|
SetDictInt("A_COLOR", A_COLOR);
|
|
@@ -2600,7 +2582,6 @@ init_curses(void)
|
|
int key;
|
|
char *key_n;
|
|
char *key_n2;
|
|
-#if !defined(__NetBSD__)
|
|
for (key=KEY_MIN;key < KEY_MAX; key++) {
|
|
key_n = (char *)keyname(key);
|
|
if (key_n == NULL || strcmp(key_n,"UNKNOWN KEY")==0)
|
|
@@ -2628,7 +2609,6 @@ init_curses(void)
|
|
if (key_n2 != key_n)
|
|
free(key_n2);
|
|
}
|
|
-#endif
|
|
SetDictInt("KEY_MIN", KEY_MIN);
|
|
SetDictInt("KEY_MAX", KEY_MAX);
|
|
}
|