From: Brian Curtin Date: Sun, 31 Oct 2010 01:10:58 +0000 (+0000) Subject: Fix ResourceWarning for unclosed files (from os.popen) X-Git-Tag: v3.2a4~237 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bf0757137f01f570826ee016cb6a77b4ccc57e69;p=python Fix ResourceWarning for unclosed files (from os.popen) --- diff --git a/Lib/uuid.py b/Lib/uuid.py index 6e687943d6..df5146428f 100644 --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -322,15 +322,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():