Issue #22131: Fixed a bug in handling an error occured during reading from

a pipe in _ipconfig_getnode().

diff --git a/Lib/uuid.py b/Lib/uuid.py
index a4e553247d95b7af15470f788955ae0c5ece7291..90f36ab1bc2503b271b2b6180f857b9f75ab9d4a 100644 (file)
--- 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.