Issue #21159: Improve message in configparser.InterpolationMissingOptionError.

Patch from Łukasz Langa.

diff --cc Lib/configparser.py
index ecd06600b127ea5d435c18bef6561080f11ccac0,dcb7ec4df28effd41a0feed1483e3176e8258f91..3a9fb56dc632c99776bd567694d646aeaa138505
--- 1/Lib/configparser.py
--- 2/Lib/configparser.py
+++ b/Lib/configparser.py
@@@ -432,7 -408,7 +430,7 @@@ class BasicInterpolation(Interpolation)
                      v = map[var]
                  except KeyError:
                      raise InterpolationMissingOptionError(
-                         option, section, rest, var) from None
 -                        option, section, rawval, var)
++                        option, section, rawval, var) from None
                  if "%" in v:
                      self._interpolate_some(parser, option, accum, v,
                                             section, map, depth + 1)
@@@ -504,7 -481,7 +503,7 @@@ class ExtendedInterpolation(Interpolati
                              "More than one ':' found: %r" % (rest,))
                  except (KeyError, NoSectionError, NoOptionError):
                      raise InterpolationMissingOptionError(
-                         option, section, rest, ":".join(path)) from None
 -                        option, section, rawval, ":".join(path))
++                        option, section, rawval, ":".join(path)) from None
                  if "$" in v:
                      self._interpolate_some(parser, opt, accum, v, sect,
                                             dict(parser.items(sect, raw=True)),

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

diff --cc Misc/NEWS
index 0376c4c8fcd92231ea3efe7b914e9a5151b768d1,9c4ea332cf8605ded94ae6bf52b2b2805a8d1cf6..4385ecbacf8ad46d7b453a423c8fd4f047c0c187
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -13,43 -13,72 +13,46 @@@ Core and Builtin
  - Issue #21167: NAN operations are now handled correctly when python is
    compiled with ICC even if -fp-model strict is not specified.
  
 -- Issue #4395: Better testing and documentation of binary operators.
 -  Patch by Martin Panter.
 -
 -- Issue #24467: Fixed possible buffer over-read in bytearray. The bytearray
 -  object now always allocates place for trailing null byte and it's buffer now
 -  is always null-terminated.
 -
 -- Issue #24115: Update uses of PyObject_IsTrue(), PyObject_Not(),
 -  PyObject_IsInstance(), PyObject_RichCompareBool() and _PyDict_Contains()
 -  to check for and handle errors correctly.
 -
 -- Issue #24257: Fixed system error in the comparison of faked
 -  types.SimpleNamespace.
 -
 -- Issue #22939: Fixed integer overflow in iterator object.  Patch by
 -  Clement Rouault.
 -
 -- Issue #23985: Fix a possible buffer overrun when deleting a slice from
 -  the front of a bytearray and then appending some other bytes data.
 -
 -- Issue #24102: Fixed exception type checking in standard error handlers.
 -
 -- Issue #23757: PySequence_Tuple() incorrectly called the concrete list API
 -  when the data was a list subclass.
 +Library
 +-------
+ 
 -- Issue #24407: Fix crash when dict is mutated while being updated.
++- Issue #21159: Improve message in configparser.InterpolationMissingOptionError.
++  Patch from Łukasz Langa.
  
 -- Issue #24096: Make warnings.warn_explicit more robust against mutation of the
 -  warnings.filters list.
 +- Issue #24847: Fixes tcltk installer layout of VC runtime DLL
  
 -- Issue #23996: Avoid a crash when a delegated generator raises an
 -  unnormalized StopIteration exception.  Patch by Stefan Behnel.
 +- Issue #24839: platform._syscmd_ver raises DeprecationWarning
  
 -- Issue #24022: Fix tokenizer crash when processing undecodable source code.
 +Documentation
 +-------------
  
 -- Issue #23309: Avoid a deadlock at shutdown if a daemon thread is aborted
 -  while it is holding a lock to a buffered I/O object, and the main thread
 -  tries to use the same I/O object (typically stdout or stderr).  A fatal
 -  error is emitted instead.
 +- Issue #23725: Overhaul tempfile docs. Note deprecated status of mktemp.
 +  Patch from Zbigniew Jędrzejewski-Szmek.
  
 -- Issue #22977: Fixed formatting Windows error messages on Wine.
 -  Patch by Martin Panter.
 +What's New in Python 3.5.0 release candidate 1?
 +===============================================
  
 -- Issue #23803: Fixed str.partition() and str.rpartition() when a separator
 -  is wider then partitioned string.
 +Release date: 2015-08-09
  
 -- Issue #23192: Fixed generator lambdas.  Patch by Bruno Cauet.
 +Core and Builtins
 +-----------------
  
 -- Issue #23629: Fix the default __sizeof__ implementation for variable-sized
 -  objects.
 +- Issue #24667: Resize odict in all cases that the underlying dict resizes.
  
 -- Issue #24044: Fix possible null pointer dereference in list.sort in out of
 -  memory conditions.
 +Library
 +-------
  
 -- Issue #21354: PyCFunction_New function is exposed by python DLL again.
 +- Issue #24824: Signatures of codecs.encode() and codecs.decode() now are
 +  compatible with pydoc.
  
 -- Issue #23812: Fix asyncio.Queue.get() to avoid loosing items on cancellation.
 -  Patch by Gustavo J. A. M. Carneiro.
 +- Issue #24634: Importing uuid should not try to load libc on Windows
  
 -Library
 --------
 +- Issue #24798: _msvccompiler.py doesn't properly support manifests
  
 -- Issue #21159: Improve message in configparser.InterpolationMissingOptionError.
 -  Patch from Łukasz Langa.
 +- Issue #4395: Better testing and documentation of binary operators.
 +  Patch by Martin Panter.
  
 -- Issue #23888: Handle fractional time in cookie expiry. Patch by ssh.
 +- 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.