Issue #20387: Merge test and patch from 3.4.4

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

diff --cc Lib/tokenize.py
Simple merge

diff --cc Misc/NEWS
index 9df9a624df38a8cabb366d822afd3ec9a0499821,1e1eba6944a3eff3ba842d8e87c02230b0774486..dc2af32e0b75d0cd1b36da4aad71d41de391a483
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,80 -2,10 +2,83 @@@
  Python News
  +++++++++++
  
 -What's New in Python 3.4.4rc1?
 -==============================
 +What's New in Python 3.5.0 beta 3?
 +==================================
 +
 +Release date: 2015-07-05
 +
 +Core and Builtins
 +-----------------
 +
 +- Upgrade to Unicode 8.0.0.
 +
 +- Issue #24345: Add Py_tp_finalize slot for the stable ABI.
 +
 +- Issue #24400: Introduce a distinct type for PEP 492 coroutines; add
 +  types.CoroutineType, inspect.getcoroutinestate, inspect.getcoroutinelocals;
 +  coroutines no longer use CO_GENERATOR flag; sys.set_coroutine_wrapper
 +  works only for 'async def' coroutines; inspect.iscoroutine no longer
 +  uses collections.abc.Coroutine, it's intended to test for pure 'async def'
 +  coroutines only; add new opcode: GET_YIELD_FROM_ITER; fix generators wrapper
 +  used in types.coroutine to be instance of collections.abc.Generator.
 +
 +Library
 +-------
 +
++- Issue #20387: Restore semantic round-trip correctness in tokenize/untokenize
++  for tab-indented blocks.
++
 +- Issue #24456: Fixed possible buffer over-read in adpcm2lin() and lin2adpcm()
 +  functions of the audioop module.
 +
 +- Issue #24336: The contextmanager decorator now works with functions with
 +  keyword arguments called "func" and "self".  Patch by Martin Panter.
 +
 +- Issue #24522: Fix possible integer overflow in json accelerator module.
 +
 +- Issue #24489: ensure a previously set C errno doesn't disturb cmath.polar().
 +
 +- Issue #24408: Fixed AttributeError in measure() and metrics() methods of
 +  tkinter.Font.
 +
 +- Issue #14373: C implementation of functools.lru_cache() now can be used with
 +  methods.
 +
 +- Issue #8232: webbrowser support incomplete on Windows. Patch by Brandon
 +  Milam
 +
 +- Issue #24347: Set KeyError if PyDict_GetItemWithError returns NULL.
 +
 +- Issue #24348: Drop superfluous incref/decref.
 +
 +- Issue #24359: Check for changed OrderedDict size during iteration.
 +
 +- Issue #24368: Support keyword arguments in OrderedDict methods.
 +
 +- Issue #24362: Simplify the C OrderedDict fast nodes resize logic.
  
 -Release date: tba
 +- Issue #24377: Fix a ref leak in OrderedDict.__repr__.
 +
 +- Issue #24369: Defend against key-changes during iteration.
 +
 +Tests
 +-----
 +
 +- Issue #24373: _testmultiphase and xxlimited now use tp_traverse and
 +  tp_finalize to avoid reference leaks encountered when combining tp_dealloc
 +  with PyType_FromSpec (see issue #16690 for details)
 +
 +Documentation
 +-------------
 +
 +- Issue #24351: Clarify what is meant by "identifier" in the context of
 +  string.Template instances.
 +
 +
 +What's New in Python 3.5.0 beta 2?
 +==================================
 +
 +Release date: 2015-05-31
  
  Core and Builtins
  -----------------