5d71b63ce0
Python 2.4.2 is a bugfix release of Python 2.4 - Python 2.4 is now in bugfix-only mode, no new features are being added. More than 60 bugs have been squashed since Python 2.4.1, including bugs that prevented Python working properly on 64 bit AIX and HP/UX. For a detailed list of changes see: http://python.org/2.4.2/NEWS.html
86 lines
2.9 KiB
Text
86 lines
2.9 KiB
Text
$NetBSD: patch-ah,v 1.2 2005/10/01 21:12:05 recht Exp $
|
|
|
|
--- Modules/_cursesmodule.c.orig 2005-06-15 20:48:16.000000000 +0200
|
|
+++ Modules/_cursesmodule.c 2005-10-01 22:25:32.000000000 +0200
|
|
@@ -317,17 +317,9 @@
|
|
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 @@
|
|
} 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 *
|
|
@@ -1950,7 +1938,6 @@
|
|
return PyCursesCheckERR(intrflush(NULL,ch), "intrflush");
|
|
}
|
|
|
|
-#if !defined(__NetBSD__)
|
|
static PyObject *
|
|
PyCurses_KeyName(PyObject *self, PyObject *args)
|
|
{
|
|
@@ -1969,7 +1956,6 @@
|
|
|
|
return PyString_FromString((knp == NULL) ? "" : (char *)knp);
|
|
}
|
|
-#endif
|
|
|
|
static PyObject *
|
|
PyCurses_KillChar(PyObject *self)
|
|
@@ -2414,9 +2400,7 @@
|
|
{"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},
|
|
@@ -2515,9 +2499,7 @@
|
|
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);
|
|
@@ -2589,7 +2571,6 @@
|
|
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)
|
|
@@ -2613,7 +2594,6 @@
|
|
if (key_n2 != key_n)
|
|
free(key_n2);
|
|
}
|
|
-#endif
|
|
SetDictInt("KEY_MIN", KEY_MIN);
|
|
SetDictInt("KEY_MAX", KEY_MAX);
|
|
}
|