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

[yury.selivanov]

https://hg.python.org/cpython/rev/76ff3cfef410
changeset:   99235:76ff3cfef410
parent:      99232:96d1cb825c85
parent:      99234:12d2ed31ed85
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Fri Nov 20 12:40:02 2015 -0500
summary:
  Merge 3.5

files:
  Lib/test/test_asyncio/test_base_events.py |  2 +-
  1 files changed, 1 insertions(+), 1 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,7 +782,7 @@
         self.loop._selector.select.return_value = (event_sentinel,)
 
         for i in range(1, 3):
-            with self.subTest('Loop %d/2' % i):
+            # 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)

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