Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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)
........
This commit is contained in:
Brian Curtin 2010-10-31 01:16:45 +00:00
parent 55b6251c9d
commit c89b734d32
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Lib/uuid.py
View File

@ -302,15 +302,15 @@ def _find_mac(command, args, hw_identifiers, get_index):
# LC_ALL to get English output, 2>/dev/null to # LC_ALL to get English output, 2>/dev/null to
# prevent output on stderr # prevent output on stderr
cmd = 'LC_ALL=C %s %s 2>/dev/null' % (executable, args) 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: except IOError:
continue 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 return None
def _ifconfig_getnode(): def _ifconfig_getnode():