From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 25 Aug 2011 23:45:32 +0000 (-0700)
Subject: python3.2 fixes: ResourceWarning: unclosed file
X-Git-Tag: v2.2.0_alpha52~60
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0484dccadf2021fd288daccea881ee1d352b0f7d;p=portage.git

python3.2 fixes: ResourceWarning: unclosed file
---

diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 1e21a521b..497927df4 100755
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -1,5 +1,5 @@
 #!/usr/bin/python -O
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 #
@@ -100,7 +100,9 @@ class dispatch:
                 path, basename = os.path.split(path)
                 find_opts = "-maxdepth 1"
 
-            confs += self.massage(os.popen(FIND_EXTANT_CONFIGS % (path, find_opts, basename)).readlines())
+            with os.popen(FIND_EXTANT_CONFIGS %
+                (path, find_opts, basename)) as proc:
+                confs += self.massage(proc.readlines())
 
         if self.options['use-rcs'] == 'yes':
             for rcs_util in ("rcs", "ci", "co", "rcsmerge"):