Issue #25523: Merge "a" to "an" fixes from 3.4 into 3.5

diff --cc Doc/c-api/buffer.rst
Simple merge

diff --cc Doc/library/concurrent.futures.rst
Simple merge

diff --cc Doc/library/difflib.rst
Simple merge

diff --cc Doc/library/fcntl.rst
Simple merge

diff --cc Doc/library/functions.rst
Simple merge

diff --cc Doc/library/gzip.rst
Simple merge

diff --cc Doc/library/multiprocessing.rst
Simple merge

diff --cc Doc/library/os.path.rst
Simple merge

diff --cc Doc/library/pickle.rst
Simple merge

diff --cc Doc/library/shutil.rst
Simple merge

diff --cc Doc/library/smtplib.rst
Simple merge

diff --cc Doc/library/socket.rst
index f7b7d3d3b7172ffcb9b5b8336567e5184ef3a299,80d5811da58a81ae2d12183f3d3616d021886558..2579b0bb1ea4165435a21ea6542a2526a2031021
--- 1/Doc/library/socket.rst
--- 2/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@@ -705,17 -685,16 +705,17 @@@ The :mod:`socket` module also offers va
  
  .. function:: inet_ntop(address_family, packed_ip)
  
 -   Convert a packed IP address (a bytes object of some number of characters) to its
 -   standard, family-specific string representation (for example, ``'7.10.0.5'`` or
 -   ``'5aef:2b::8'``). :func:`inet_ntop` is useful when a library or network protocol
 -   returns an object of type :c:type:`struct in_addr` (similar to :func:`inet_ntoa`)
 -   or :c:type:`struct in6_addr`.
 +   Convert a packed IP address (a :term:`bytes-like object` of some number of
 +   bytes) to its standard, family-specific string representation (for
 +   example, ``'7.10.0.5'`` or ``'5aef:2b::8'``).
 +   :func:`inet_ntop` is useful when a library or network protocol returns an
 +   object of type :c:type:`struct in_addr` (similar to :func:`inet_ntoa`) or
 +   :c:type:`struct in6_addr`.
  
     Supported values for *address_family* are currently :const:`AF_INET` and
 -   :const:`AF_INET6`. If the string *packed_ip* is not the correct length for the
 -   specified address family, :exc:`ValueError` will be raised.
 +   :const:`AF_INET6`. If the bytes object *packed_ip* is not the correct
 +   length for the specified address family, :exc:`ValueError` will be raised.
-    A :exc:`OSError` is raised for errors from the call to :func:`inet_ntop`.
+    :exc:`OSError` is raised for errors from the call to :func:`inet_ntop`.
  
     Availability: Unix (maybe not all platforms), Windows.
  

diff --cc Doc/library/sqlite3.rst
Simple merge

diff --cc Doc/library/stdtypes.rst
Simple merge

diff --cc Doc/library/tempfile.rst
Simple merge

diff --cc Doc/library/unittest.mock.rst
Simple merge

diff --cc Include/abstract.h
Simple merge

diff --cc Include/codecs.h
Simple merge

diff --cc Lib/_pyio.py
Simple merge

diff --cc Lib/codecs.py
Simple merge

diff --cc Lib/concurrent/futures/_base.py
index 9e447137adce8acad4c8f9c89c288054c7b6917d,b2598339bbfa7668595112e52fe18a775719cbb3..295489c93e56d85f53bc9460842d21fbf2a60a3a
--- 1/Lib/concurrent/futures/_base.py
--- 2/Lib/concurrent/futures/_base.py
+++ b/Lib/concurrent/futures/_base.py
@@@ -520,8 -517,8 +520,8 @@@ class Executor(object)
          """
          raise NotImplementedError()
  
 -    def map(self, fn, *iterables, timeout=None):
 +    def map(self, fn, *iterables, timeout=None, chunksize=1):
-         """Returns a iterator equivalent to map(fn, iter).
+         """Returns an iterator equivalent to map(fn, iter).
  
          Args:
              fn: A callable that will take as many arguments as there are

diff --cc Lib/difflib.py
Simple merge

diff --cc Lib/ftplib.py
Simple merge

diff --cc Lib/pickle.py
Simple merge

diff --cc Lib/test/pystone.py
Simple merge

diff --cc Lib/test/support/__init__.py
Simple merge

diff --cc Lib/test/test_codecs.py
Simple merge

diff --cc Lib/test/test_email/test_email.py
Simple merge

diff --cc Lib/test/test_ipaddress.py
Simple merge

diff --cc Lib/test/test_os.py
Simple merge

diff --cc Lib/test/test_urllib.py
Simple merge

diff --cc Lib/test/test_weakref.py
Simple merge

diff --cc Lib/xmlrpc/client.py
Simple merge

diff --cc Misc/HISTORY
index bca793c1269721984ca43e2e49fc0b2bae904cf0,cf5d72fda7da465fe46ada1be25825ea686b5846..24cb69ff7b4dcdb26d29663f3abed1130bfd97e2
--- 1/Misc/HISTORY
--- 2/Misc/HISTORY
+++ b/Misc/HISTORY
@@@ -23104,8 -23071,8 +23104,8 @@@ application only)
  no longer use the default root.
  
  - The interfaces for the bind*() and unbind() widget methods have been
 -redesigned; the bind*() methods now return the name of the Tcl command 
 +redesigned; the bind*() methods now return the name of the Tcl command
- created for the callback, and this can be passed as a optional
+ created for the callback, and this can be passed as an optional
  argument to unbind() in order to delete the command (normally, such
  commands are automatically unbound when the widget is destroyed, but
  for some applications this isn't enough).

diff --cc Misc/NEWS
index 20b1ae42e05d48d81faa60e3b0d4b2b9c0909910,8b26bd524fa3f743a20f40ee95962144ea071cdd..81e2a552698eb44191e0b8c1a53655504b94d861
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -226,319 -212,316 +226,319 @@@ Librar
  - Issue #21159: Improve message in configparser.InterpolationMissingOptionError.
    Patch from Łukasz Langa.
  
 -- Issue #23888: Handle fractional time in cookie expiry. Patch by ssh.
 +- Issue #20362: Honour TestCase.longMessage correctly in assertRegex.
 +  Patch from Ilia Kurenkov.
  
 -- Issue #23004: mock_open() now reads binary data correctly when the type of
 -  read_data is bytes.  Initial patch by Aaron Hill.
 +- Issue #23572: Fixed functools.singledispatch on classes with falsy
 +  metaclasses.  Patch by Ethan Furman.
  
 -- Issue #23652: Make it possible to compile the select module against the
 -  libc headers from the Linux Standard Base, which do not include some
 -  EPOLL macros.  Patch by Matt Frank.
 +- asyncio: ensure_future() now accepts awaitable objects.
  
 -- Issue #22932: Fix timezones in email.utils.formatdate.
 -  Patch from Dmitry Shachnev.
 +IDLE
 +----
  
 -- Issue #23779: imaplib raises TypeError if authenticator tries to abort.
 -  Patch from Craig Holmquist.
 +- Issue #24820: IDLE now has an 'IDLE Dark' built-in text color theme.
 +  It is more or less IDLE Classic inverted, with a cobalt blue background.
 +  Strings, comments, keywords, ... are still green, red, orange, ... .
 +  Selecting it displays the following warning and solution.
 +  "IDLE Dark is new in October, 2015.  Trying to run earlier versions
 +  of IDLE with it selected will disable colorizing, or worse.
 +  If you might ever run an earlier release of IDLE, then before
 +  exiting this version, either switch to another theme or hit the
 +  'Save as New Custom Theme' button.  The latter requires a new name,
 +  such as 'Custom Dark', but the custom theme will work with any IDLE
 +  release, and can be modified."
  
 -- Issue #23319: Fix ctypes.BigEndianStructure, swap correctly bytes. Patch
 -  written by Matthieu Gautier.
 +- Issue #25224: README.txt is now an idlelib index for IDLE developers and
 +  curious users.  The previous user content is now in the IDLE doc and is
 +  redundant.  IDLE now means 'Integrated Development and Learning Environment'.
  
 -- Issue #23254: Document how to close the TCPServer listening socket.
 -  Patch from Martin Panter.
 +- Issue #24820: Users can now set breakpoint colors in
 +  Settings -> Custom Highlighting.  Original patch by Mark Roseman.
  
 -- Issue #19450: Update Windows and OS X installer builds to use SQLite 3.8.11.
 +- Issue #24972: Inactive selection background now matches active selection
 +  background, as configured by user, on all systems.  Found items are now
 +  always highlighted on Windows.  Initial patch by Mark Roseman.
  
 -- Issue #23441: rcompleter now prints a tab character instead of displaying
 -  possible completions for an empty word.  Initial patch by Martin Sekera.
 +- Issue #24570: Idle: make calltip and completion boxes appear on Macs
 +  affected by a tk regression.  Initial patch by Mark Roseman.
  
 -- Issue #24735: Fix invalid memory access in
 -  itertools.combinations_with_replacement().
 +- Issue #24988: Idle ScrolledList context menus (used in debugger)
 +  now work on Mac Aqua.  Patch by Mark Roseman.
  
 -- Issue #17527: Add PATCH to wsgiref.validator. Patch from Luca Sbardella.
 +- Issue #24801: Make right-click for context menu work on Mac Aqua.
 +  Patch by Mark Roseman.
  
 -- Issue #24683: Fixed crashes in _json functions called with arguments of
 -  inappropriate type.
 +- Issue #25173: Associate tkinter messageboxes with a specific widget.
 +  For Mac OSX, make them a 'sheet'.  Patch by Mark Roseman.
  
 -- Issue #21697: shutil.copytree() now correctly handles symbolic links that
 -  point to directories.  Patch by Eduardo Seabra and Thomas Kluyver.
 +- Issue #25198: Enhance the initial html viewer now used for Idle Help.
 +  * Properly indent fixed-pitch text (patch by Mark Roseman).
 +  * Give code snippet a very Sphinx-like light blueish-gray background.
 +  * Re-use initial width and height set by users for shell and editor.
 +  * When the Table of Contents (TOC) menu is used, put the section header
 +  at the top of the screen.
  
 -- Issue #24620: Random.setstate() now validates the value of state last element.
 +- Issue #25225: Condense and rewrite Idle doc section on text colors.
  
 -- Issue #22153: Improve unittest docs. Patch from Martin Panter and evilzero.
 +- Issue #21995: Explain some differences between IDLE and console Python.
  
 -- Issue #24206: Fixed __eq__ and __ne__ methods of inspect classes.
 +- Issue #22820: Explain need for *print* when running file from Idle editor.
  
 -- Issue #21750: mock_open.read_data can now be read from each instance, as it
 -  could in Python 3.3.
 +- Issue #25224: Doc: augment Idle feature list and no-subprocess section.
  
 -- Issue #23247: Fix a crash in the StreamWriter.reset() of CJK codecs.
 +- Issue #25219: Update doc for Idle command line options.
 +  Some were missing and notes were not correct.
  
 -- Issue #18622: unittest.mock.mock_open().reset_mock would recurse infinitely.
 -  Patch from Nicola Palumbo and Laurent De Buyst.
 +- Issue #24861: Most of idlelib is private and subject to change.
 +  Use idleib.idle.* to start Idle. See idlelib.__init__.__doc__.
  
 -- Issue #24608: chunk.Chunk.read() now always returns bytes, not str.
 +- Issue #25199: Idle: add synchronization comments for future maintainers.
  
 -- Issue #18684: Fixed reading out of the buffer in the re module.
 +- Issue #16893: Replace help.txt with help.html for Idle doc display.
 +  The new idlelib/help.html is rstripped Doc/build/html/library/idle.html.
 +  It looks better than help.txt and will better document Idle as released.
 +  The tkinter html viewer that works for this file was written by Mark Roseman.
 +  The now unused EditorWindow.HelpDialog class and helt.txt file are deprecated.
  
 -- Issue #24259: tarfile now raises a ReadError if an archive is truncated
 -  inside a data segment.
 +- Issue #24199: Deprecate unused idlelib.idlever with possible removal in 3.6.
  
 -- Issue #24552: Fix use after free in an error case of the _pickle module.
 +- Issue #24782: In Idle extension config dialog, replace tabs with sorted list.
 +  Patch by Mark Roseman.
  
 -- Issue #24514: tarfile now tolerates number fields consisting of only
 -  whitespace.
 +- Issue #24790: Remove extraneous code (which also create 2 & 3 conflicts).
  
 -- Issue #19176: Fixed doctype() related bugs in C implementation of ElementTree.
 -  A deprecation warning no longer issued by XMLParser subclass with default
 -  doctype() method.  Direct call of doctype() now issues a warning.  Parser's
 -  doctype() now is not called if target's doctype() is called.  Based on patch
 -  by Martin Panter.
 +Documentation
 +-------------
  
 -- Issue #20387: Restore semantic round-trip correctness in tokenize/untokenize
 -  for tab-indented blocks.
 +- Issue #12067: Rewrite Comparisons section in the Expressions chapter of the
 +  language reference. Some of the details of comparing mixed types were
 +  incorrect or ambiguous. NotImplemented is only relevant at a lower level
 +  than the Expressions chapter. Added details of comparing range() objects,
 +  and default behaviour and consistency suggestions for user-defined classes.
 +  Patch from Andy Maier.
  
 -- Issue #24456: Fixed possible buffer over-read in adpcm2lin() and lin2adpcm()
 -  functions of the audioop module.
 +- Issue #24952: Clarify the default size argument of stack_size() in
 +  the "threading" and "_thread" modules. Patch from Mattip.
  
 -- Issue #24336: The contextmanager decorator now works with functions with
 -  keyword arguments called "func" and "self".  Patch by Martin Panter.
 +- Issue #23725: Overhaul tempfile docs. Note deprecated status of mktemp.
 +  Patch from Zbigniew Jędrzejewski-Szmek.
  
 -- Issue #24489: ensure a previously set C errno doesn't disturb cmath.polar().
 +- Issue #24808: Update the types of some PyTypeObject fields.  Patch by
 +  Joseph Weston.
  
 -- Issue #5633: Fixed timeit when the statement is a string and the setup is not.
 +- Issue #22812: Fix unittest discovery examples.
 +  Patch from Pam McA'Nulty.
  
 -- Issue #24326: Fixed audioop.ratecv() with non-default weightB argument.
 -  Original patch by David Moore.
 +Tests
 +-----
  
- - Issue #25099: Make test_compileall not fail when a entry on sys.path cannot
 -- Issue #23840: tokenize.open() now closes the temporary binary file on error
 -  to fix a resource warning.
++- Issue #25099: Make test_compileall not fail when an entry on sys.path cannot
 +  be written to (commonly seen in administrative installs on Windows).
  
 -- Issue #24257: Fixed segmentation fault in sqlite3.Row constructor with faked
 -  cursor type.
 +- Issue #23919: Prevents assert dialogs appearing in the test suite.
  
 -- Issue #22107: tempfile.gettempdir() and tempfile.mkdtemp() now try again
 -  when a directory with the chosen name already exists on Windows as well as
 -  on Unix.  tempfile.mkstemp() now fails early if parent directory is not
 -  valid (not exists or is a file) on Windows.
 +- PCbuild\rt.bat now accepts an unlimited number of arguments to pass along
 +  to regrtest.py.  Previously there was a limit of 9.
  
 -- Issue #6598: Increased time precision and random number range in
 -  email.utils.make_msgid() to strengthen the uniqueness of the message ID.
 +Build
 +-----
  
 -- Issue #24091: Fixed various crashes in corner cases in C implementation of
 -  ElementTree.
 +- Issue #24915: Add LLVM support for PGO builds and use the test suite to
 +  generate the profile data. Initial patch by Alecsandru Patrascu of Intel.
  
 -- Issue #21931: msilib.FCICreate() now raises TypeError in the case of a bad
 -  argument instead of a ValueError with a bogus FCI error number.
 -  Patch by Jeffrey Armstrong.
 +- Issue #24910: Windows MSIs now have unique display names.
  
 -- Issue #23796: peek and read1 methods of BufferedReader now raise ValueError
 -  if they called on a closed object. Patch by John Hergenroeder.
 +- Issue #24986: It is now possible to build Python on Windows without errors
 +  when external libraries are not available.
  
 -- Issue #24521: Fix possible integer overflows in the pickle module.
 +Windows
 +-------
  
 -- Issue #22931: Allow '[' and ']' in cookie values.
 +- Issue #25450: Updates shortcuts to start Python in installation directory.
  
 -- Issue #20274: Remove ignored and erroneous "kwargs" parameters from three
 -  METH_VARARGS methods on _sqlite.Connection.
 +- Issue #25164: Changes default all-users install directory to match per-user
 +  directory.
  
 -- Issue #24094: Fix possible crash in json.encode with poorly behaved dict
 -  subclasses.
 +- Issue #25143: Improves installer error messages for unsupported platforms.
  
 -- Asyncio issue 222 / PR 231 (Victor Stinner) -- fix @coroutine
 -  functions without __name__.
 +- Issue #25163: Display correct directory in installer when using non-default
 +  settings.
  
 -- Issue #9246: On POSIX, os.getcwd() now supports paths longer than 1025 bytes.
 -  Patch written by William Orr.
 +- Issue #25361: Disables use of SSE2 instructions in Windows 32-bit build
  
 -- The keywords attribute of functools.partial is now always a dictionary.
 +- Issue #25089: Adds logging to installer for case where launcher is not
 +  selected on upgrade.
  
 -- Issues #24099, #24100, and #24101: Fix free-after-use bug in heapq's siftup
 -  and siftdown functions.
 +- Issue #25165: Windows uninstallation should not remove launcher if other
 +  versions remain
  
 -- Backport collections.deque fixes from Python 3.5.  Prevents reentrant badness
 -  during deletion by deferring the decref until the container has been restored
 -  to a consistent state.
 +- Issue #25112: py.exe launcher is missing icons
  
 -- Issue #23008: Fixed resolving attributes with boolean value is False in pydoc.
 +- Issue #25102: Windows installer does not precompile for -O or -OO.
  
 -- Fix asyncio issue 235: LifoQueue and PriorityQueue's put didn't
 -  increment unfinished tasks (this bug was introduced in 3.4.3 when
 -  JoinableQueue was merged with Queue).
 +- Issue #25081: Makes Back button in installer go back to upgrade page when
 +  upgrading.
  
 -- Issue #23908: os functions now reject paths with embedded null character
 -  on Windows instead of silently truncate them.
 +- Issue #25091: Increases font size of the installer.
  
 -- Issue #23728: binascii.crc_hqx() could return an integer outside of the range
 -  0-0xffff for empty data.
 +- Issue #25126: Clarifies that the non-web installer will download some
 +  components.
  
 -- Issue #23811: Add missing newline to the PyCompileError error message.
 -  Patch by Alex Shkop.
 +- Issue #25213: Restores requestedExecutionLevel to manifest to disable
 +  UAC virtualization.
  
 -- Issue #17898: Fix exception in gettext.py when parsing certain plural forms.
 +- Issue #25022: Removed very outdated PC/example_nt/ directory.
  
 -- Issue #22982: Improve BOM handling when seeking to multiple positions of
 -  a writable text file.
 +Tools/Demos
 +-----------
  
 -- Issue #23865: close() methods in multiple modules now are idempotent and more
 -  robust at shutdown. If they need to release multiple resources, all are
 -  released even if errors occur.
 +- Issue #25440: Fix output of python-config --extension-suffix.
  
 -- Issue #23881: urllib.request.ftpwrapper constructor now closes the socket if
 -  the FTP connection failed to fix a ResourceWarning.
  
 -- Issue #23400: Raise same exception on both Python 2 and 3 if sem_open is not
 -  available.  Patch by Davin Potts.
 +What's New in Python 3.5.0 final?
 +=================================
  
 -- Issue #15133: _tkinter.tkapp.getboolean() now supports Tcl_Obj and always
 -  returns bool.  tkinter.BooleanVar now validates input values (accepted bool,
 -  int, str, and Tcl_Obj).  tkinter.BooleanVar.get() now always returns bool.
 +Release date: 2015-09-13
  
 -- Issue #23338: Fixed formatting ctypes error messages on Cygwin.
 -  Patch by Makoto Kato.
 +Build
 +-----
  
 -- Issue #16840: Tkinter now supports 64-bit integers added in Tcl 8.4 and
 -  arbitrary precision integers added in Tcl 8.5.
 +- Issue #25071: Windows installer should not require TargetDir
 +  parameter when installing quietly.
  
 -- Issue #23834: Fix socket.sendto(), use the C Py_ssize_t type to store the
 -  result of sendto() instead of the C int type.
  
 -- Issue #21526: Tkinter now supports new boolean type in Tcl 8.5.
 +What's New in Python 3.5.0 release candidate 4?
 +===============================================
  
 -- Issue #23838: linecache now clears the cache and returns an empty result on
 -  MemoryError.
 +Release date: 2015-09-09
  
 -- Issue #18473: Fixed 2to3 and 3to2 compatible pickle mappings.  Fixed
 -  ambigious reverse mappings.  Added many new mappings.  Import mapping is no
 -  longer applied to modules already mapped with full name mapping.
 +Library
 +-------
  
 -- Issue #23745: The new email header parser now handles duplicate MIME
 -  parameter names without error, similar to how get_param behaves.
 +- Issue #25029: Fixes MemoryError in test_strptime.
  
 -- Issue #23792: Ignore KeyboardInterrupt when the pydoc pager is active.
 -  This mimics the behavior of the standard unix pagers, and prevents
 -  pipepager from shutting down while the pager itself is still running.
 +Build
 +-----
  
 -- Issue #23742: ntpath.expandvars() no longer loses unbalanced single quotes.
 +- Issue #25027: Reverts partial-static build options and adds
 +  vcruntime140.dll to Windows installation.
  
 -- Issue #21802: The reader in BufferedRWPair now is closed even when closing
 -  writer failed in BufferedRWPair.close().
  
 -- Issue #23671: string.Template now allows to specify the "self" parameter as
 -  keyword argument.  string.Formatter now allows to specify the "self" and
 -  the "format_string" parameters as keyword arguments.
 +What's New in Python 3.5.0 release candidate 3?
 +===============================================
  
 -- Issue #21560: An attempt to write a data of wrong type no longer cause
 -  GzipFile corruption.  Original patch by Wolfgang Maier.
 +Release date: 2015-09-07
  
 -- Issue #23647: Increase impalib's MAXLINE to accommodate modern mailbox sizes.
 +Core and Builtins
 +-----------------
  
 -- Issue #23539: If body is None, http.client.HTTPConnection.request now sets
 -  Content-Length to 0 for PUT, POST, and PATCH headers to avoid 411 errors from
 -  some web servers.
 +- Issue #24305: Prevent import subsystem stack frames from being counted
 +  by the warnings.warn(stacklevel=) parameter.
  
 -- Issue #22351: The nntplib.NNTP constructor no longer leaves the connection
 -  and socket open until the garbage collector cleans them up.  Patch by
 -  Martin Panter.
 +- Issue #24912: Prevent __class__ assignment to immutable built-in objects.
  
 -- Issue #23136: _strptime now uniformly handles all days in week 0, including
 -  Dec 30 of previous year.  Based on patch by Jim Carroll.
 +- Issue #24975: Fix AST compilation for PEP 448 syntax.
  
 -- Issue #23700: Iterator of NamedTemporaryFile now keeps a reference to
 -  NamedTemporaryFile instance.  Patch by Bohuslav Kabrda.
 +Library
 +-------
  
 -- Issue #22903: The fake test case created by unittest.loader when it fails
 -  importing a test module is now picklable.
 +- Issue #24917: time_strftime() buffer over-read.
  
 -- Issue #23568: Add rdivmod support to MagicMock() objects.
 -  Patch by Håkan Lövdahl.
 +- Issue #24748: To resolve a compatibility problem found with py2exe and
 +  pywin32, imp.load_dynamic() once again ignores previously loaded modules
 +  to support Python modules replacing themselves with extension modules.
 +  Patch by Petr Viktorin.
  
 -- Issue #23138: Fixed parsing cookies with absent keys or values in cookiejar.
 -  Patch by Demian Brecht.
 +- Issue #24635: Fixed a bug in typing.py where isinstance([], typing.Iterable)
 +  would return True once, then False on subsequent calls.
  
 -- Issue #23051: multiprocessing.Pool methods imap() and imap_unordered() now
 -  handle exceptions raised by an iterator.  Patch by Alon Diamant and Davin
 -  Potts.
 +- Issue #24989: Fixed buffer overread in BytesIO.readline() if a position is
 +  set beyond size.  Based on patch by John Leitch.
  
 -- Issue #22928: Disabled HTTP header injections in http.client.
 -  Original patch by Demian Brecht.
 +- Issue #24913: Fix overrun error in deque.index().
 +  Found by John Leitch and Bryce Darling.
  
 -- Issue #23615: Modules bz2, tarfile and tokenize now can be reloaded with
 -  imp.reload().  Patch by Thomas Kluyver.
  
 -- Issue #23476: In the ssl module, enable OpenSSL's X509_V_FLAG_TRUSTED_FIRST
 -  flag on certificate stores when it is available.
 +What's New in Python 3.5.0 release candidate 2?
 +===============================================
  
 -- Issue #23576: Avoid stalling in SSL reads when EOF has been reached in the
 -  SSL layer but the underlying connection hasn't been closed.
 +Release date: 2015-08-25
  
 -- Issue #23504: Added an __all__ to the types module.
 +Core and Builtins
 +-----------------
  
 -- Issue #20204: Added the __module__ attribute to _tkinter classes.
 +- Issue #24769: Interpreter now starts properly when dynamic loading
 +  is disabled.  Patch by Petr Viktorin.
  
 -- Issue #23521: Corrected pure python implementation of timedelta division.
 +- Issue #21167: NAN operations are now handled correctly when python is
 +  compiled with ICC even if -fp-model strict is not specified.
  
 - * Eliminated OverflowError from timedelta * float for some floats;
 - * Corrected rounding in timedlta true division.
 +- Issue #24492: A "package" lacking a __name__ attribute when trying to perform
 +  a ``from .. import ...`` statement will trigger an ImportError instead of an
 +  AttributeError.
  
 -- Issue #21619: Popen objects no longer leave a zombie after exit in the with
 -  statement if the pipe was broken.  Patch by Martin Panter.
 +Library
 +-------
  
 -- Issue #6639: Module-level turtle functions no longer raise TclError after
 -  closing the window.
 +- Issue #24847: Removes vcruntime140.dll dependency from Tcl/Tk.
  
 -- Issues #814253, #9179: Warnings now are raised when group references and
 -  conditional group references are used in lookbehind assertions in regular
 -  expressions.
 +- Issue #24839: platform._syscmd_ver raises DeprecationWarning
  
 -- Issue #23215: Multibyte codecs with custom error handlers that ignores errors
 -  consumed too much memory and raised SystemError or MemoryError.
 -  Original patch by Aleksi Torhamo.
 +- Issue #24867: Fix Task.get_stack() for 'async def' coroutines
  
 -- Issue #5700: io.FileIO() called flush() after closing the file.
 -  flush() was not called in close() if closefd=False.
  
 -- Issue #23374: Fixed pydoc failure with non-ASCII files when stdout encoding
 -  differs from file system encoding (e.g. on Mac OS).
 +What's New in Python 3.5.0 release candidate 1?
 +===============================================
  
 -- Issue #23481: Remove RC4 from the SSL module's default cipher list.
 +Release date: 2015-08-09
  
 -- Issue #21548: Fix pydoc.synopsis() and pydoc.apropos() on modules with empty
 -  docstrings.
 +Core and Builtins
 +-----------------
  
 -- Issue #22885: Fixed arbitrary code execution vulnerability in the dbm.dumb
 -  module.  Original patch by Claudiu Popa.
 +- Issue #24667: Resize odict in all cases that the underlying dict resizes.
  
 -- Issue #23146: Fix mishandling of absolute Windows paths with forward
 -  slashes in pathlib.
 +Library
 +-------
  
 -- Issue #23421: Fixed compression in tarfile CLI.  Patch by wdv4758h.
 +- Issue #24824: Signatures of codecs.encode() and codecs.decode() now are
 +  compatible with pydoc.
  
 -- Issue #23367: Fix possible overflows in the unicodedata module.
 +- Issue #24634: Importing uuid should not try to load libc on Windows
  
 -- Issue #23361: Fix possible overflow in Windows subprocess creation code.
 +- Issue #24798: _msvccompiler.py doesn't properly support manifests
  
 -- Issue #23801: Fix issue where cgi.FieldStorage did not always ignore the
 -  entire preamble to a multipart body.
 +- Issue #4395: Better testing and documentation of binary operators.
 +  Patch by Martin Panter.
  
 -- Issue #23310: Fix MagicMock's initializer to work with __methods__, just
 -  like configure_mock().  Patch by Kasia Jachim.
 +- Issue #23973: Update typing.py from GitHub repo.
  
 -- asyncio: New event loop APIs: set_task_factory() and get_task_factory().
 +- Issue #23004: mock_open() now reads binary data correctly when the type of
 +  read_data is bytes.  Initial patch by Aaron Hill.
  
 -- asyncio: async() function is deprecated in favour of ensure_future().
 +- Issue #23888: Handle fractional time in cookie expiry. Patch by ssh.
  
 -- Issue #23898: Fix inspect.classify_class_attrs() to support attributes
 -  with overloaded __eq__ and __bool__.  Patch by Mike Bayer.
 +- Issue #23652: Make it possible to compile the select module against the
 +  libc headers from the Linux Standard Base, which do not include some
 +  EPOLL macros.  Patch by Matt Frank.
  
 -- Issue #24298: Fix inspect.signature() to correctly unwrap wrappers
 -  around bound methods.
 +- Issue #22932: Fix timezones in email.utils.formatdate.
 +  Patch from Dmitry Shachnev.
  
 -- Issue #23572: Fixed functools.singledispatch on classes with falsy
 -  metaclasses.  Patch by Ethan Furman.
 +- Issue #23779: imaplib raises TypeError if authenticator tries to abort.
 +  Patch from Craig Holmquist.
 +
 +- Issue #23319: Fix ctypes.BigEndianStructure, swap correctly bytes. Patch
 +  written by Matthieu Gautier.
 +
 +- Issue #23254: Document how to close the TCPServer listening socket.
 +  Patch from Martin Panter.
 +
 +- Issue #19450: Update Windows and OS X installer builds to use SQLite 3.8.11.
 +
 +- Issue #17527: Add PATCH to wsgiref.validator. Patch from Luca Sbardella.
 +
 +- Issue #24791: Fix grammar regression for call syntax: 'g(\*a or b)'.
  
  IDLE
  ----

diff --cc Modules/_hashopenssl.c
Simple merge

diff --cc Modules/_io/_iomodule.c
Simple merge

diff --cc Modules/_io/textio.c
Simple merge

diff --cc Modules/_pickle.c
index f3b73f176dd0703fd078c4b4bbcc57646fda4c46,8a98f512e32b042a2d9f698b501a4a7f2eee3ab3..5f385000b972baf9c3345fcd1ec8963e98532d16
--- 1/Modules/_pickle.c
--- 2/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@@ -4109,9 -4041,8 +4109,9 @@@ to map the new Python 3 names to the ol
  [clinic start generated code]*/
  
  static int
 -_pickle_Pickler___init___impl(PicklerObject *self, PyObject *file, PyObject *protocol, int fix_imports)
 -/*[clinic end generated code: output=56e229f3b1f4332f input=4faabdbc763c2389]*/
 +_pickle_Pickler___init___impl(PicklerObject *self, PyObject *file,
 +                              PyObject *protocol, int fix_imports)
- /*[clinic end generated code: output=b5f31078dab17fb0 input=b8cdeb7e3f5ee674]*/
++/*[clinic end generated code: output=b5f31078dab17fb0 input=4faabdbc763c2389]*/
  {
      _Py_IDENTIFIER(persistent_id);
      _Py_IDENTIFIER(dispatch_table);
@@@ -6528,10 -6457,8 +6528,10 @@@ string instances as bytes objects
  [clinic start generated code]*/
  
  static int
 -_pickle_Unpickler___init___impl(UnpicklerObject *self, PyObject *file, int fix_imports, const char *encoding, const char *errors)
 -/*[clinic end generated code: output=b9ed1d84d315f3b5 input=04ece661aa884837]*/
 +_pickle_Unpickler___init___impl(UnpicklerObject *self, PyObject *file,
 +                                int fix_imports, const char *encoding,
 +                                const char *errors)
- /*[clinic end generated code: output=e2c8ce748edc57b0 input=30b4dc9e976b890c]*/
++/*[clinic end generated code: output=e2c8ce748edc57b0 input=04ece661aa884837]*/
  {
      _Py_IDENTIFIER(persistent_load);
  
@@@ -6959,9 -6886,8 +6959,9 @@@ to map the new Python 3 names to the ol
  [clinic start generated code]*/
  
  static PyObject *
 -_pickle_dump_impl(PyModuleDef *module, PyObject *obj, PyObject *file, PyObject *protocol, int fix_imports)
 -/*[clinic end generated code: output=a606e626d553850d input=830f8a64cef6f042]*/
 +_pickle_dump_impl(PyModuleDef *module, PyObject *obj, PyObject *file,
 +                  PyObject *protocol, int fix_imports)
- /*[clinic end generated code: output=0de7dff89c406816 input=e9e5fdd48de92eae]*/
++/*[clinic end generated code: output=0de7dff89c406816 input=830f8a64cef6f042]*/
  {
      PicklerObject *pickler = _Pickler_New();
  
@@@ -7074,9 -6999,8 +7074,9 @@@ string instances as bytes objects
  [clinic start generated code]*/
  
  static PyObject *
 -_pickle_load_impl(PyModuleDef *module, PyObject *file, int fix_imports, const char *encoding, const char *errors)
 -/*[clinic end generated code: output=568c61356c172654 input=2df7c7a1e6742204]*/
 +_pickle_load_impl(PyModuleDef *module, PyObject *file, int fix_imports,
 +                  const char *encoding, const char *errors)
- /*[clinic end generated code: output=798f1c57cb2b4eb1 input=da97372e38e510a6]*/
++/*[clinic end generated code: output=798f1c57cb2b4eb1 input=2df7c7a1e6742204]*/
  {
      PyObject *result;
      UnpicklerObject *unpickler = _Unpickler_New();

diff --cc Modules/atexitmodule.c
Simple merge

diff --cc Modules/audioop.c
Simple merge

diff --cc Modules/clinic/_pickle.c.h
index b698ce81bd34387c6f698e35f131c38c37b44b90,c0c54d20234e0bde09f510bf9df1ddfc512a30fe..a9f0c42441f59da9cf2629ec6f97d0cada13bca0
--- 1/Modules/clinic/_pickle.c.h
--- 2/Modules/clinic/_pickle.c.h
+++ b/Modules/clinic/_pickle.c.h
@@@ -545,4 -542,4 +545,4 @@@ _pickle_loads(PyModuleDef *module, PyOb
  exit:
      return return_value;
  }
- /*[clinic end generated code: output=06f3a5233298448e input=a9049054013a1b77]*/
 -/*[clinic end generated code: output=1ba210152e2261d8 input=a9049054013a1b77]*/
++/*[clinic end generated code: output=aecd61660d1cf31d input=a9049054013a1b77]*/

diff --cc Modules/readline.c
Simple merge

diff --cc Objects/abstract.c
Simple merge

diff --cc Objects/exceptions.c
Simple merge

diff --cc Python/compile.c
Simple merge

diff --cc Python/thread.c
Simple merge