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

[benjamin.peterson]

http://hg.python.org/cpython/rev/0cae103a42d2
changeset:   74186:0cae103a42d2
parent:      74183:b30a94f7e053
parent:      74184:4964712a7269
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Dec 27 15:17:15 2011 -0600
summary:
  merge 3.2

files:
  Lib/test/test_epoll.py |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_epoll.py b/Lib/test/test_epoll.py
--- a/Lib/test/test_epoll.py
+++ b/Lib/test/test_epoll.py
@@ -36,6 +36,7 @@
 except IOError as e:
     if e.errno == errno.ENOSYS:
         raise unittest.SkipTest("kernel doesn't support epoll()")
+    raise
 
 class TestEPoll(unittest.TestCase):
 

-- 
Repository URL: http://hg.python.org/cpython