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

[xavier.degaye]

https://hg.python.org/cpython/rev/f043683f9b40
changeset:   105084:f043683f9b40
branch:      3.6
parent:      105081:8820387f2667
parent:      105083:d82f43d8927a
user:        Xavier de Gaye <xdegaye at users.sourceforge.net>
date:        Sun Nov 13 19:41:07 2016 +0100
summary:
  Merge 3.5

files:
  Lib/test/test_socket.py |  3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -1480,7 +1480,8 @@
         # type and populates the socket object.
         #
         # On Windows this trick won't work, so the test is skipped.
-        fd, _ = tempfile.mkstemp()
+        fd, path = tempfile.mkstemp()
+        self.addCleanup(os.unlink, path)
         with socket.socket(family=42424, type=13331, fileno=fd) as s:
             self.assertEqual(s.family, 42424)
             self.assertEqual(s.type, 13331)

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