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

[yury.selivanov]

https://hg.python.org/cpython/rev/0d0a82bf4537
changeset:   99241:0d0a82bf4537
parent:      99238:4c57c36690a9
parent:      99240:f7dc0c8a73b6
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Fri Nov 20 12:44:12 2015 -0500
summary:
  Merge 3.5

files:
  Lib/test/test_asyncio/test_base_events.py |  7 +++----
  1 files changed, 3 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py
--- a/Lib/test/test_asyncio/test_base_events.py
+++ b/Lib/test/test_asyncio/test_base_events.py
@@ -782,10 +782,9 @@
         self.loop._selector.select.return_value = (event_sentinel,)
 
         for i in range(1, 3):
-            # with self.subTest('Loop %d/2' % i):  # Not in Python 3.3.
-                self.loop.call_soon(self.loop.stop)
-                self.loop.run_forever()
-                self.assertEqual(callcount, 1)
+            self.loop.call_soon(self.loop.stop)
+            self.loop.run_forever()
+            self.assertEqual(callcount, 1)
 
     def test_run_once(self):
         # Simple test for test_utils.run_once().  It may seem strange

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