Merge heads

Lib/multiprocessing/connection.py

@@ -41,7 +41,6 @@ import errno
 import time
 import tempfile
 import itertools
-import select
 
 import _multiprocessing
 from multiprocessing import current_process, AuthenticationError
@@ -201,28 +200,6 @@ if sys.platform != 'win32':
         return c1, c2
 
 else:
-    if hasattr(select, 'poll'):
-        def _poll(fds, timeout):
-            if timeout is not None:
-                timeout = int(timeout) * 1000  # timeout is in milliseconds
-            fd_map = {}
-            pollster = select.poll()
-            for fd in fds:
-                pollster.register(fd, select.POLLIN)
-                if hasattr(fd, 'fileno'):
-                    fd_map[fd.fileno()] = fd
-                else:
-                    fd_map[fd] = fd
-            ls = []
-            for fd, event in pollster.poll(timeout):
-                if event & select.POLLNVAL:
-                    raise ValueError('invalid file descriptor %i' % fd)
-                ls.append(fd_map[fd])
-            return ls
-    else:
-        def _poll(fds, timeout):
-            return select.select(fds, [], [], timeout)[0]
-
     from _multiprocessing import win32
 
     def Pipe(duplex=True):