bpo-32370: Use the correct encoding for ipconfig output in the uuid module. (GH-5608)
(cherry picked from commit da6c3da6c33c6bf794f741e348b9c6d86cc43ec5)
Co-authored-by: Segev Finer <segev208@gmail.com>
diff --git a/Lib/uuid.py b/Lib/uuid.py
index ef7b3b5..9cb73e8 100644
--- a/Lib/uuid.py
+++ b/Lib/uuid.py
@@ -468,7 +468,7 @@
def _ipconfig_getnode():
"""Get the hardware address on Windows by running ipconfig.exe."""
- import os, re
+ import os, re, subprocess
first_local_mac = None
dirs = ['', r'c:\windows\system32', r'c:\winnt\system32']
try:
@@ -480,11 +480,13 @@
pass
for dir in dirs:
try:
- pipe = os.popen(os.path.join(dir, 'ipconfig') + ' /all')
+ proc = subprocess.Popen([os.path.join(dir, 'ipconfig'), '/all'],
+ stdout=subprocess.PIPE,
+ encoding="oem")
except OSError:
continue
- with pipe:
- for line in pipe:
+ with proc:
+ for line in proc.stdout:
value = line.split(':')[-1].strip().lower()
if re.match('([0-9a-f][0-9a-f]-){5}[0-9a-f][0-9a-f]', value):
mac = int(value.replace('-', ''), 16)