Issue #24917: Backed out changeset 09b62202d9b7

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

diff --cc Misc/NEWS
index 3299322142cac8031d220f6983ca801d8aa77000,dd175fead46e030d58893938c2bb7a1795a7d149..5f23605b23be53d41172266007a111e25bcd9698
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -95,70 -81,26 +95,68 @@@ Core and Builtin
  Library
  -------
  
- - Issue #24917: time_strftime() Buffer Over-read. 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 #24635: Fixed a bug in typing.py where isinstance([], typing.Iterable)
 +  would return True once, then False on subsequent calls.
  
 -- Issue #21112: Fix regression in unittest.expectedFailure on subclasses.
 -  Patch from Berker Peksag.
 +- Issue #24989: Fixed buffer overread in BytesIO.readline() if a position is
 +  set beyond size.  Based on patch by John Leitch.
  
 -- Issue #24931: Instances of subclasses of namedtuples have their own __dict__
 -  which breaks the inherited __dict__ property and breaks the _asdict() method.
 -  Removed the __dict__ property to prevent the conflict and fixed _asdict().
 +- Issue #24913: Fix overrun error in deque.index().
 +  Found by John Leitch and Bryce Darling.
  
 -- Issue #24764: cgi.FieldStorage.read_multi() now ignores the Content-Length
 -  header in part headers. Patch written by Peter Landry and reviewed by Pierre
 -  Quentel.
  
 -- Issue #24774: Fix docstring in http.server.test. Patch from Chiu-Hsiang Hsu.
 +What's New in Python 3.5.0 release candidate 2?
 +===============================================
  
 -- Issue #21159: Improve message in configparser.InterpolationMissingOptionError.
 -  Patch from Łukasz Langa.
 +Release date: 2015-08-25
  
 -- Issue #23888: Handle fractional time in cookie expiry. Patch by ssh.
 +Core and Builtins
 +-----------------
 +
 +- Issue #24769: Interpreter now starts properly when dynamic loading
 +  is disabled.  Patch by Petr Viktorin.
 +
 +- Issue #21167: NAN operations are now handled correctly when python is
 +  compiled with ICC even if -fp-model strict is not specified.
 +
 +- Issue #24492: A "package" lacking a __name__ attribute when trying to perform
 +  a ``from .. import ...`` statement will trigger an ImportError instead of an
 +  AttributeError.
 +
 +Library
 +-------
 +
 +- Issue #24847: Removes vcruntime140.dll dependency from Tcl/Tk.
 +
 +- Issue #24839: platform._syscmd_ver raises DeprecationWarning
 +
 +- Issue #24867: Fix Task.get_stack() for 'async def' coroutines
 +
 +
 +What's New in Python 3.5.0 release candidate 1?
 +===============================================
 +
 +Release date: 2015-08-09
 +
 +Core and Builtins
 +-----------------
 +
 +- Issue #24667: Resize odict in all cases that the underlying dict resizes.
 +
 +Library
 +-------
 +
 +- Issue #24824: Signatures of codecs.encode() and codecs.decode() now are
 +  compatible with pydoc.
 +
 +- Issue #24634: Importing uuid should not try to load libc on Windows
 +
 +- Issue #24798: _msvccompiler.py doesn't properly support manifests
 +
 +- Issue #4395: Better testing and documentation of binary operators.
 +  Patch by Martin Panter.
 +
 +- Issue #23973: Update typing.py from GitHub repo.
  
  - Issue #23004: mock_open() now reads binary data correctly when the type of
    read_data is bytes.  Initial patch by Aaron Hill.

diff --cc Modules/timemodule.c
Simple merge