diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py index 43fadaf1a3d..b4e114c8440 100644 --- a/Lib/test/test_tokenize.py +++ b/Lib/test/test_tokenize.py @@ -834,7 +834,7 @@ from tokenize import (tokenize, _tokenize, untokenize, NUMBER, NAME, OP, 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 @@ class TestDetectEncoding(TestCase): 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 --git a/Lib/tokenize.py b/Lib/tokenize.py index d65325e62e2..f58c2869017 100644 --- a/Lib/tokenize.py +++ b/Lib/tokenize.py @@ -435,11 +435,15 @@ def open(filename): 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 --git a/Misc/NEWS b/Misc/NEWS index a50d0d961d5..dabfa8afc8e 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -323,6 +323,9 @@ Core and Builtins 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