Merge 3.5 (issue #27040)

1st1 · 1st1 · commit 7c3ac2d1f82e · 2016-05-16T15:32:26.000-04:00
diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
@@ -1079,6 +1079,11 @@ def subprocess_exec(self, protocol_factory, program, *args,
             logger.info('%s: %r' % (debug_log, transport))
         return transport, protocol
 
+    def get_exception_handler(self):
+        """Return an exception handler, or None if the default one is in use.
+        """
+        return self._exception_handler
+
     def set_exception_handler(self, handler):
         """Set handler as the new event loop exception handler.
 
diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py
@@ -484,6 +484,9 @@ def get_task_factory(self):
 
     # Error handlers.
 
+    def get_exception_handler(self):
+        raise NotImplementedError
+
     def set_exception_handler(self, handler):
         raise NotImplementedError
 
diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py
@@ -658,8 +658,10 @@ def run_loop():
         self.loop.set_debug(True)
         self.loop._process_events = mock.Mock()
 
+        self.assertIsNone(self.loop.get_exception_handler())
         mock_handler = mock.Mock()
         self.loop.set_exception_handler(mock_handler)
+        self.assertIs(self.loop.get_exception_handler(), mock_handler)
         handle = run_loop()
         mock_handler.assert_called_with(self.loop, {
             'exception': MOCK_ANY,
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -979,6 +979,8 @@ Library
 - Issue #26848: Fix asyncio/subprocess.communicate() to handle empty input.
   Patch by Jack O'Connor.
 
+- Issue #27040: Add loop.get_exception_handler method
+
 IDLE
 ----
 
