From: Brian Curtin <brian.curtin@gmail.com>
Date: Sat, 30 Oct 2010 21:37:28 +0000 (+0000)
Subject: Merged revisions 85990 via svnmerge from
X-Git-Tag: v3.1.3rc1~72
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a0ba0f38df7a18206f109f575d69f1eef8a3a356;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 85990 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85990 | brian.curtin | 2010-10-30 16:35:28 -0500 (Sat, 30 Oct 2010) | 2 lines

  Fix #10258 - clean up resource warning
........
---

diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
index 5a25251d9004..482af94a323e 100644
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -592,8 +592,10 @@ def roundtrip(f):
     """
     if isinstance(f, str):
         f = BytesIO(f.encode('utf-8'))
-    token_list = list(tokenize(f.readline))
-    f.close()
+    try:
+        token_list = list(tokenize(f.readline))
+    finally:
+        f.close()
     tokens1 = [tok[:2] for tok in token_list]
     new_bytes = untokenize(tokens1)
     readline = (line for line in new_bytes.splitlines(1)).__next__