summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-06-09 18:10:13 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2013-06-09 18:10:13 (GMT)
commit531381f207911db931470ed313be4f2df844d36b (patch)
treecbaea91cd1a1b8e1a601cf5a28fd60428e3c6664
parent46bebee25f8cdbec6bbee04fdf9681edf0155c5b (diff)
parent6f50b810b78eaecff78bb7e2a3109d1cc672dbe0 (diff)
downloadcpython-531381f207911db931470ed313be4f2df844d36b.zip
cpython-531381f207911db931470ed313be4f2df844d36b.tar.gz
cpython-531381f207911db931470ed313be4f2df844d36b.tar.bz2
Issue #16102: Make uuid._netbios_getnode() work again on Python 3.
-rw-r--r--Lib/uuid.py2
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/uuid.py b/Lib/uuid.py
index 5d091b9..0cdcd38 100644
--- a/Lib/uuid.py
+++ b/Lib/uuid.py
@@ -406,7 +406,7 @@ def _netbios_getnode():
if win32wnet.Netbios(ncb) != 0:
continue
status._unpack()
- bytes = map(ord, status.adapter_address)
+ bytes = status.adapter_address
return ((bytes[0]<<40) + (bytes[1]<<32) + (bytes[2]<<24) +
(bytes[3]<<16) + (bytes[4]<<8) + bytes[5])
diff --git a/Misc/NEWS b/Misc/NEWS
index bada878..14f17b3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -115,6 +115,8 @@ Core and Builtins
Library
-------
+- Issue #16102: Make uuid._netbios_getnode() work again on Python 3.
+
- Issue #17134: Add ssl.enum_cert_store() as interface to Windows' cert store.
- Issue #18143: Implement ssl.get_default_verify_paths() in order to debug