Issue #24336: The contextmanager decorator now works with functions with

keyword arguments called "func" and "self".  Patch by Martin Panter.

diff --cc Lib/contextlib.py
Simple merge

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

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

diff --cc Misc/NEWS
index 4605ccc57f946354214cc3d16b7460d7f3eb9edb,02b129a508359d8535d2bd474837f9c6bf625de0..3ecc73df2becb49114034ff1f15bbc3e9a34a9a2
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -2,75 -2,10 +2,77 @@@
  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 #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.
 +
 +- 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)
  
 -Release date: tba
 +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
  -----------------