Merged revisions 86009 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86009 | brian.curtin | 2010-10-30 20:10:58 -0500 (Sat, 30 Oct 2010) | 2 lines

  Fix ResourceWarning for unclosed files (from os.popen)
........

diff --git a/Lib/uuid.py b/Lib/uuid.py
index 259f1bbb0e75dbadd8bd19563e7d9afbad86ed20..4f8d539a90fe9558a268f822985d343e52859041 100644 (file)
--- a/Lib/uuid.py
+++ b/Lib/uuid.py
@@ -302,15 +302,15 @@ def _find_mac(command, args, hw_identifiers, get_index):
             # LC_ALL to get English output, 2>/dev/null to
             # prevent output on stderr
             cmd = 'LC_ALL=C %s %s 2>/dev/null' % (executable, args)
-            pipe = os.popen(cmd)
+            with os.popen(cmd) as pipe:
+                for line in pipe:
+                    words = line.lower().split()
+                    for i in range(len(words)):
+                        if words[i] in hw_identifiers:
+                            return int(
+                                words[get_index(i)].replace(':', ''), 16)
         except IOError:
             continue
-
-        for line in pipe:
-            words = line.lower().split()
-            for i in range(len(words)):
-                if words[i] in hw_identifiers:
-                    return int(words[get_index(i)].replace(':', ''), 16)
     return None
 
 def _ifconfig_getnode():