diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2014-09-06 19:17:24 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-09-06 19:17:24 (GMT) |
| commit | c70386ec16c373dc3c2b2778f12f1772985bd304 (patch) | |
| tree | 544a1e62bb3cbaaa00324d30d5269ebefdf9cf66 | |
| parent | f54c350160c16cdaf9f692e0f61ef062d4f379f4 (diff) | |
| download | cpython-c70386ec16c373dc3c2b2778f12f1772985bd304.zip cpython-c70386ec16c373dc3c2b2778f12f1772985bd304.tar.gz cpython-c70386ec16c373dc3c2b2778f12f1772985bd304.tar.bz2 | |
Issue #22131: Fixed a bug in handling an error occured during reading from
a pipe in _ipconfig_getnode().
| -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 a4e5532..90f36ab 100644 --- a/Lib/uuid.py +++ b/Lib/uuid.py @@ -383,13 +383,11 @@ def _ipconfig_getnode(): pipe = os.popen(os.path.join(dir, 'ipconfig') + ' /all') except OSError: 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. |