summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2014-05-27 21:12:32 +0300
committerAndrew Svetlov <andrew.svetlov@gmail.com>2014-05-27 21:12:32 +0300
commitb3535fe264bafdff20fe9013dd06d6949803c2c3 (patch)
tree26b772d9716b5b6fd365f56d8c9e16c591e3bf7c
parent130c97ac7956ca3436f88ee0b3f91b65bc7a8450 (diff)
downloadtrollius-b3535fe264bafdff20fe9013dd06d6949803c2c3.tar.gz
Fix for raising exception not derived from BaseException in _SelectorSslTransport.resume_reading
-rw-r--r--asyncio/selector_events.py2
-rw-r--r--tests/test_selector_events.py4
2 files changed, 5 insertions, 1 deletions
diff --git a/asyncio/selector_events.py b/asyncio/selector_events.py
index c7df8d8..86a8d23 100644
--- a/asyncio/selector_events.py
+++ b/asyncio/selector_events.py
@@ -670,7 +670,7 @@ class _SelectorSslTransport(_SelectorTransport):
def resume_reading(self):
if not self._paused:
- raise ('Not paused')
+ raise RuntimeError('Not paused')
self._paused = False
if self._closing:
return
diff --git a/tests/test_selector_events.py b/tests/test_selector_events.py
index 0735237..d7fafab 100644
--- a/tests/test_selector_events.py
+++ b/tests/test_selector_events.py
@@ -711,6 +711,8 @@ class SelectorSocketTransportTests(unittest.TestCase):
tr.resume_reading()
self.assertFalse(tr._paused)
self.loop.assert_reader(7, tr._read_ready)
+ with self.assertRaises(RuntimeError):
+ tr.resume_reading()
def test_read_ready(self):
transport = _SelectorSocketTransport(
@@ -1125,6 +1127,8 @@ class SelectorSslTransportTests(unittest.TestCase):
tr.resume_reading()
self.assertFalse(tr._paused)
self.loop.assert_reader(1, tr._read_ready)
+ with self.assertRaises(RuntimeError):
+ tr.resume_reading()
def test_write(self):
transport = self._make_one()