mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-01 12:52:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-32370: Use the correct encoding for ipconfig output in the uuid module. (GH-5608)

Browse source 
(cherry picked from commit da6c3da6c3)

Co-authored-by: Segev Finer <segev208@gmail.com>
This commit is contained in:
Miss Islington (bot) 2018-02-13 00:58:28 -08:00 • committed by GitHub
parent 53374cc57f
commit 9b5a90b975
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/uuid.py
View file

@ -468,7 +468,7 @@ def _netstat_getnode():
def _ipconfig_getnode(): def _ipconfig_getnode():
"""Get the hardware address on Windows by running ipconfig.exe.""" """Get the hardware address on Windows by running ipconfig.exe."""
import os, re import os, re, subprocess
first_local_mac = None first_local_mac = None
dirs = ['', r'c:\windows\system32', r'c:\winnt\system32'] dirs = ['', r'c:\windows\system32', r'c:\winnt\system32']
try: try:
@ -480,11 +480,13 @@ def _ipconfig_getnode():
pass pass
for dir in dirs: for dir in dirs:
try: 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: except OSError:
continue continue
with pipe: with proc:
for line in pipe: for line in proc.stdout:
value = line.split(':')[-1].strip().lower() value = line.split(':')[-1].strip().lower()
if re.match('([0-9a-f][0-9a-f]-){5}[0-9a-f][0-9a-f]', value): if re.match('([0-9a-f][0-9a-f]-){5}[0-9a-f][0-9a-f]', value):
mac = int(value.replace('-', ''), 16) mac = int(value.replace('-', ''), 16)

2
Misc/NEWS.d/next/Windows/2018-02-10-15-38-19.bpo-32370.kcKuct.rst Normal file
View file

@ -0,0 +1,2 @@
Use the correct encoding for ipconfig output in the uuid module.
Patch by Segev Finer.