From: Brian Curtin <brian.curtin@gmail.com>
Date: Fri, 5 Nov 2010 14:52:43 +0000 (+0000)
Subject: Merged revisions 86192 via svnmerge from
X-Git-Tag: v3.1.3rc1~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=18716a3a2384edbdbb40d4592dc3936eadaf0c9d;p=thirdparty%2FPython%2Fcpython.git

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

........
  r86192 | brian.curtin | 2010-11-05 09:48:35 -0500 (Fri, 05 Nov 2010) | 3 lines

  Shift the pipe-using code into an else block, then close the pipe
  in finally. Removes two ResourceWarnings.
........
---

diff --git a/Lib/uuid.py b/Lib/uuid.py
index df5146428f09..5684ad7aceec 100644
--- a/Lib/uuid.py
+++ b/Lib/uuid.py
@@ -373,10 +373,13 @@ def _ipconfig_getnode():
             pipe = os.popen(os.path.join(dir, 'ipconfig') + ' /all')
         except IOError:
             continue
-        for line in pipe:
-            value = line.split(':')[-1].strip().lower()
-            if re.match('([0-9a-f][0-9a-f]-){5}[0-9a-f][0-9a-f]', value):
-                return int(value.replace('-', ''), 16)
+        else:
+            for line in pipe:
+                value = line.split(':')[-1].strip().lower()
+                if re.match('([0-9a-f][0-9a-f]-){5}[0-9a-f][0-9a-f]', value):
+                    return int(value.replace('-', ''), 16)
+        finally:
+            pipe.close()
 
 def _netbios_getnode():
     """Get the hardware address on Windows using NetBIOS calls.