merge 3.2

2011-12-27 15:17:15 -06:00 · 2011-12-27 15:17:15 -06:00 · a5f6f2aba3
parent 2fb9ae9dfc 0e61350d3a
commit a5f6f2aba3
1 changed files with 1 additions and 0 deletions
--- a/Lib/test/test_epoll.py
+++ b/Lib/test/test_epoll.py
@ -36,6 +36,7 @@ try:
 except IOError as e:
    if e.errno == errno.ENOSYS:
        raise unittest.SkipTest("kernel doesn't support epoll()")
+    raise

 class TestEPoll(unittest.TestCase):