From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 28 Jan 2016 14:44:10 +0000 (+0100)
Subject: Merge 3.5: Issue #26227
X-Git-Tag: v3.6.0a1~682
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c8d2fb4112116f2510a5c848a8e825c9d52fd678;p=thirdparty%2FPython%2Fcpython.git

Merge 3.5: Issue #26227
---

c8d2fb4112116f2510a5c848a8e825c9d52fd678
diff --cc Misc/NEWS
index 6e1a5a0d91b6,d6f81db4b847..b4ed741aa4f0
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -159,10 -66,10 +159,14 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #26227: On Windows, getnameinfo(), gethostbyaddr() and
+   gethostbyname_ex() functions of the socket module now decode the hostname
+   from the ANSI code page rather than UTF-8.
+ 
 +- Issue #26099: The site module now writes an error into stderr if
 +  sitecustomize module can be imported but executing the module raise an
 +  ImportError. Same change for usercustomize.
 +
  - Issue #26147: xmlrpc now works with strings not encodable with used
    non-UTF-8 encoding.