summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-06-09 18:08:05 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2013-06-09 18:08:05 (GMT)
commit6f50b810b78eaecff78bb7e2a3109d1cc672dbe0 (patch)
tree1085bbf68055087b75ff4d7bf45253fbf8cf55af
parente7275ffa4ceb7bbf3cbbd0dabe3f38d97e1466a9 (diff)
downloadcpython-6f50b810b78eaecff78bb7e2a3109d1cc672dbe0.zip
cpython-6f50b810b78eaecff78bb7e2a3109d1cc672dbe0.tar.gz
cpython-6f50b810b78eaecff78bb7e2a3109d1cc672dbe0.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 0df0743..049b46c 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 3ad038f..58ae9ba 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,8 @@ Core and Builtins
Library
-------
+- Issue #16102: Make uuid._netbios_getnode() work again on Python 3.
+
- Issue #18109: os.uname() now decodes fields from the locale encoding, and
socket.gethostname() now decodes the hostname from the locale encoding,
instead of using the UTF-8 encoding in strict mode.