diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2014-09-06 19:17:06 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-09-06 19:17:06 (GMT) |
| commit | 9bc3d980e9d684df283ba91682b5a49c712e280a (patch) | |
| tree | f108b41e36e0e4ed48817d8458e868638a8f6c73 /Lib/uuid.py | |
| parent | fcf701aad1abe2c65c648c0340cc580d525ca503 (diff) | |
| download | cpython-9bc3d980e9d684df283ba91682b5a49c712e280a.zip cpython-9bc3d980e9d684df283ba91682b5a49c712e280a.tar.gz cpython-9bc3d980e9d684df283ba91682b5a49c712e280a.tar.bz2 | |
Issue #22131: Fixed a bug in handling an error occured during reading from
a pipe in _ipconfig_getnode().
Diffstat (limited to 'Lib/uuid.py')
| -rw-r--r-- | Lib/uuid.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Lib/uuid.py b/Lib/uuid.py index 63cb3ae..7b9b373 100644 --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -366,13 +366,11 @@ def _ipconfig_getnode(): pipe = os.popen(os.path.join(dir, 'ipconfig') + ' /all') except IOError: continue - else: + with pipe: for line in pipe: value = line.split(':')[-1].strip().lower() 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(): """Get the hardware address on Windows using NetBIOS calls. |