diff -Nurd python2.5-2.5/Modules/selectmodule.c patch/Modules/selectmodule.c
--- python2.5-2.5/Modules/selectmodule.c	2006-07-10 01:18:57.000000000 +0000
+++ patch/Modules/selectmodule.c	2007-01-21 20:36:48.000000000 +0000
@@ -672,7 +672,7 @@
 
 static PyMethodDef select_methods[] = {
     {"select",	select_select, METH_VARARGS, select_doc},
-#if defined(HAVE_POLL) 
+#if defined(HAVE_POLL) && !defined(HAVE_BROKEN_POLL)
     {"poll",    select_poll,   METH_NOARGS, poll_doc},
 #endif /* HAVE_POLL */
     {0,  	0},			     /* sentinel */
@@ -695,7 +695,7 @@
 	SelectError = PyErr_NewException("select.error", NULL, NULL);
 	Py_INCREF(SelectError);
 	PyModule_AddObject(m, "error", SelectError);
-#if defined(HAVE_POLL) 
+#if defined(HAVE_POLL) && !defined(HAVE_BROKEN_POLL)
 
 #ifdef __APPLE__
 	if (select_have_broken_poll()) {