Merge 3.6

2016-11-13 19:42:09 +01:00 · 2016-11-13 19:42:09 +01:00 · daa9e239f0
parent 77f6411d96 f056b04eea
commit daa9e239f0
1 changed files with 2 additions and 1 deletions
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@ -1490,7 +1490,8 @@ class GeneralModuleTests(unittest.TestCase):
        # 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)