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

[xavier.degaye]

https://hg.python.org/cpython/rev/facef53c1d1d
changeset:   105085:facef53c1d1d
parent:      105082:51d07aaa70ef
parent:      105084:f043683f9b40
user:        Xavier de Gaye <xdegaye at users.sourceforge.net>
date:        Sun Nov 13 19:42:09 2016 +0100
summary:
  Merge 3.6

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
@@ -1490,7 +1490,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