Merge 3.4

diff --cc Misc/NEWS
index 7a48b062045bdf116c6733cedb0f4b8343d87866,e9fe6c7c9810d949edd1e4e07f92c21083335ac3..bc9a4b7fc9711855be47e66b8bb18a209d4d0929
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -11,26 -10,6 +11,32 @@@ Release date: TB
  Core and Builtins
  -----------------
  
 +Library
 +-------
 +
++- Issue #24684: socket.socket.getaddrinfo() now calls
++  PyUnicode_AsEncodedString() instead of calling the encode() method of the
++  host, to handle correctly custom string with an encode() method which doesn't
++  return a byte string. The encoder of the IDNA codec is now called directly
++  instead of calling the encode() method of the string.
++
 +- Issue #25060: Correctly compute stack usage of the BUILD_MAP opcode.
 +
 +- Issue #24857: Comparing call_args to a long sequence now correctly returns a
 +  boolean result instead of raising an exception.  Patch by A Kaptur.
 +
 +- Issue #23144: Make sure that HTMLParser.feed() returns all the data, even
 +  when convert_charrefs is True.
 +
 +- Issue #24982: shutil.make_archive() with the "zip" format now adds entries
 +  for directories (including empty directories) in ZIP file.
 +
 +- Issue #25019: Fixed a crash caused by setting non-string key of expat parser.
 +  Based on patch by John Leitch.
 +
 +- Issue #16180: Exit pdb if file has syntax error, instead of trapping user
 +  in an infinite loop.  Patch by Xavier de Gaye.
 +
  - Issue #24891: Fix a race condition at Python startup if the file descriptor
    of stdin (0), stdout (1) or stderr (2) is closed while Python is creating
    sys.stdin, sys.stdout and sys.stderr objects. These attributes are now set

diff --cc Modules/socketmodule.c
Simple merge