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

[yury.selivanov]

https://hg.python.org/cpython/rev/3d19bbabb5ec
changeset:   99588:3d19bbabb5ec
parent:      99585:ceb50507ae88
parent:      99587:5629ccdfc874
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Wed Dec 16 19:36:01 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
@@ -1368,7 +1368,7 @@
         self.assertRaises(
             OSError, self.loop.run_until_complete, coro)
 
-    @patch_socket 
+    @patch_socket
     def test_create_datagram_endpoint_socket_err(self, m_socket):
         m_socket.getaddrinfo = socket.getaddrinfo
         m_socket.socket.side_effect = OSError

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