mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Shift the pipe-using code into an else block, then close the pipe

Browse source 
in finally. Removes two ResourceWarnings.
This commit is contained in:
Brian Curtin 2010-11-05 14:48:35 +00:00
parent a277ec4ad9
commit 69cd87b5fa
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/uuid.py
View file

@ -373,10 +373,13 @@ def _ipconfig_getnode():
pipe = os.popen(os.path.join(dir, 'ipconfig') + ' /all') pipe = os.popen(os.path.join(dir, 'ipconfig') + ' /all')
except IOError: except IOError:
continue continue
for line in pipe: else:
value = line.split(':')[-1].strip().lower() for line in pipe:
if re.match('([0-9a-f][0-9a-f]-){5}[0-9a-f][0-9a-f]', value): value = line.split(':')[-1].strip().lower()
return int(value.replace('-', ''), 16) 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(): def _netbios_getnode():
"""Get the hardware address on Windows using NetBIOS calls. """Get the hardware address on Windows using NetBIOS calls.