From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Mon, 3 Jan 2011 14:30:43 +0000 (+0000)
Subject: test_tkinter: use a context manager to close directly the pipe
X-Git-Tag: v3.2rc1~230
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=270fe408319ad575092efca0dcdebab9ecdba70c;p=python

test_tkinter: use a context manager to close directly the pipe

Patch written by Nadeem Vawda
---

diff --git a/Lib/tkinter/test/test_tkinter/test_loadtk.py b/Lib/tkinter/test/test_tkinter/test_loadtk.py
index 8f1a085b6d..bab7bcd37c 100644
--- a/Lib/tkinter/test/test_tkinter/test_loadtk.py
+++ b/Lib/tkinter/test/test_tkinter/test_loadtk.py
@@ -31,7 +31,8 @@ class TkLoadTest(unittest.TestCase):
                 # doesn't actually carry through to the process level
                 # because they don't support unsetenv
                 # If that's the case, abort.
-                display = os.popen('echo $DISPLAY').read().strip()
+                with os.popen('echo $DISPLAY') as pipe:
+                    display = pipe.read().strip()
                 if display:
                     return
 
diff --git a/Misc/ACKS b/Misc/ACKS
index 6a3a25bd71..dccb779074 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -866,6 +866,7 @@ Andrew Vant
 Atul Varma
 Dmitry Vasiliev
 Alexandre Vassalotti
+Nadeem Vawda
 Frank Vercruesse
 Mike Verdone
 Jaap Vermeulen