[Python-checkins] cpython (3.4): Issue #18644: Fix a ResourceWarning in formatter.test().

berker.peksag python-checkins at python.org
Mon Jan 5 08:19:21 CET 2015


https://hg.python.org/cpython/rev/f859a61f5853
changeset:   94024:f859a61f5853
branch:      3.4
parent:      94022:8ac23d3242b4
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Mon Jan 05 09:19:40 2015 +0200
summary:
  Issue #18644: Fix a ResourceWarning in formatter.test().

Patch by Vajrasky Kok.

files:
  Lib/formatter.py |  14 +++++++++-----
  1 files changed, 9 insertions(+), 5 deletions(-)


diff --git a/Lib/formatter.py b/Lib/formatter.py
--- a/Lib/formatter.py
+++ b/Lib/formatter.py
@@ -436,11 +436,15 @@
         fp = open(sys.argv[1])
     else:
         fp = sys.stdin
-    for line in fp:
-        if line == '\n':
-            f.end_paragraph(1)
-        else:
-            f.add_flowing_data(line)
+    try:
+        for line in fp:
+            if line == '\n':
+                f.end_paragraph(1)
+            else:
+                f.add_flowing_data(line)
+    finally:
+        if fp is not sys.stdin:
+            fp.close()
     f.end_paragraph(0)
 
 

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list