changeset:   96287:c5cfd6353b4b
parent:      96284:cf7e905ef5dd
parent:      96286:a640d268ba97
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Tue May 26 00:49:14 2015 +0200
files:       Misc/NEWS
description:
(Merge 3.6) Issue #23840: tokenize.open() now closes the temporary binary file
on error to fix a resource warning.


diff -r cf7e905ef5dd -r c5cfd6353b4b Lib/test/test_tokenize.py
--- a/Lib/test/test_tokenize.py	Mon May 25 13:05:48 2015 -0700
+++ b/Lib/test/test_tokenize.py	Tue May 26 00:49:14 2015 +0200
@@ -834,7 +834,7 @@
                      STRING, ENDMARKER, ENCODING, tok_name, detect_encoding,
                      open as tokenize_open, Untokenizer)
 from io import BytesIO
-from unittest import TestCase
+from unittest import TestCase, mock
 import os, sys, glob
 import token
 
@@ -1246,6 +1246,14 @@
             ins = Bunk(lines, path)
             detect_encoding(ins.readline)
 
+    def test_open_error(self):
+        # Issue #23840: open() must close the binary file on error
+        m = BytesIO(b'#coding:xxx')
+        with mock.patch('tokenize._builtin_open', return_value=m):
+            self.assertRaises(SyntaxError, tokenize_open, 'foobar')
+        self.assertTrue(m.closed)
+
+
 
 class TestTokenize(TestCase):
 
diff -r cf7e905ef5dd -r c5cfd6353b4b Lib/tokenize.py
--- a/Lib/tokenize.py	Mon May 25 13:05:48 2015 -0700
+++ b/Lib/tokenize.py	Tue May 26 00:49:14 2015 +0200
@@ -435,11 +435,15 @@
     detect_encoding().
     """
     buffer = _builtin_open(filename, 'rb')
-    encoding, lines = detect_encoding(buffer.readline)
-    buffer.seek(0)
-    text = TextIOWrapper(buffer, encoding, line_buffering=True)
-    text.mode = 'r'
-    return text
+    try:
+        encoding, lines = detect_encoding(buffer.readline)
+        buffer.seek(0)
+        text = TextIOWrapper(buffer, encoding, line_buffering=True)
+        text.mode = 'r'
+        return text
+    except:
+        buffer.close()
+        raise
 
 
 def tokenize(readline):
diff -r cf7e905ef5dd -r c5cfd6353b4b Misc/NEWS
--- a/Misc/NEWS	Mon May 25 13:05:48 2015 -0700
+++ b/Misc/NEWS	Tue May 26 00:49:14 2015 +0200
@@ -335,6 +335,9 @@
 Library
 -------
 
+- Issue #23840: tokenize.open() now closes the temporary binary file on error
+  to fix a resource warning.
+
 - Issue #16914: new debuglevel 2 in smtplib adds timestamps to debug output.
 
 - Issue #7159: urllib.request now supports sending auth credentials