[Python-checkins] cpython (merge 2.7 -> 2.7): Merge heads

Tue Jan 15 14:40:06 CET 2013

http://hg.python.org/cpython/rev/2e1f1b096f3d
changeset: 81521:2e1f1b096f3d
branch: 2.7
parent: 81517:33a8ef498b1e
parent: 81513:f07435fa6736
user: Serhiy Storchaka <storchaka at gmail.com>
date: Tue Jan 15 15:32:49 2013 +0200
summary:
 Merge heads
files:
 Lib/multiprocessing/connection.py | 23 -------------------
 1 files changed, 0 insertions(+), 23 deletions(-)

diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py
--- a/Lib/multiprocessing/connection.py
+++ b/Lib/multiprocessing/connection.py
@@ -41,7 +41,6 @@
 import time
 import tempfile
 import itertools
-import select
 
 import _multiprocessing
 from multiprocessing import current_process, AuthenticationError
@@ -201,28 +200,6 @@
 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):
-- 
Repository URL: http://hg.python.org/cpython
