[Python-checkins] cpython (merge 3.4 -> default): Merge 3.4

Thu Jan 22 09:09:36 CET 2015

https://hg.python.org/cpython/rev/208f401fbbbe
changeset: 94237:208f401fbbbe
parent: 94235:69265fcade13
parent: 94236:d3a27a27e008
user: Victor Stinner <victor.stinner at gmail.com>
date: Thu Jan 22 09:09:24 2015 +0100
summary:
 Merge 3.4
files:
 Lib/test/test_selectors.py | 2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Lib/test/test_selectors.py b/Lib/test/test_selectors.py
--- a/Lib/test/test_selectors.py
+++ b/Lib/test/test_selectors.py
@@ -323,6 +323,8 @@
 @unittest.skipIf(sys.platform == 'win32',
 'select.select() cannot be used with empty fd sets')
 def test_empty_select(self):
+ # Issue #23009: Make sure EpollSelector.select() works when no FD is
+ # registered.
 s = self.SELECTOR()
 self.addCleanup(s.close)
 self.assertEqual(s.select(timeout=0), [])
-- 
Repository URL: https://hg.python.org/cpython
