From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Tue, 27 May 2014 18:24:43 +0000 (+0300)
Subject: Fix for raising exception not derived from BaseException in _SelectorSslTransport... 
X-Git-Tag: v3.4.2rc1~491
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3207a03035deabbff8a68f4f29dc33d1da944801;p=thirdparty%2FPython%2Fcpython.git

Fix for raising exception not derived from BaseException in _SelectorSslTransport.resume_reading
---

diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py
index c7df8d8dd001..86a8d23c09ae 100644
--- a/Lib/asyncio/selector_events.py
+++ b/Lib/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/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py
index 0735237ccade..d7fafab69171 100644
--- a/Lib/test/test_asyncio/test_selector_events.py
+++ b/Lib/test/test_asyncio/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()