diff options
| -rw-r--r-- | Lib/uuid.py | 10 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Windows/2018-02-10-15-38-19.bpo-32370.kcKuct.rst | 2 |
2 files changed, 8 insertions, 4 deletions
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 _netstat_getnode(): 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 @@ def _ipconfig_getnode(): 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) diff --git a/Misc/NEWS.d/next/Windows/2018-02-10-15-38-19.bpo-32370.kcKuct.rst b/Misc/NEWS.d/next/Windows/2018-02-10-15-38-19.bpo-32370.kcKuct.rst new file mode 100644 index 0000000..7f076d4 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2018-02-10-15-38-19.bpo-32370.kcKuct.rst @@ -0,0 +1,2 @@ +Use the correct encoding for ipconfig output in the uuid module. +Patch by Segev Finer. |