diff options
| author | Brian Curtin <brian.curtin@gmail.com> | 2010-10-31 01:15:00 (GMT) |
|---|---|---|
| committer | Brian Curtin <brian.curtin@gmail.com> | 2010-10-31 01:15:00 (GMT) |
| commit | 0343d8f4f19d53f8cd968fdbc097e372821c61ba (patch) | |
| tree | 0085accfb3e2c685f7e8cc4636a83db80d235ce8 /Lib/uuid.py | |
| parent | a813a638ef92dfde2cff66339b319780691f4bb3 (diff) | |
| download | cpython-0343d8f4f19d53f8cd968fdbc097e372821c61ba.zip cpython-0343d8f4f19d53f8cd968fdbc097e372821c61ba.tar.gz cpython-0343d8f4f19d53f8cd968fdbc097e372821c61ba.tar.bz2 | |
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)
........
Diffstat (limited to 'Lib/uuid.py')
| -rw-r--r-- | Lib/uuid.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Lib/uuid.py b/Lib/uuid.py index 6e687943..df51464 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(): |