Asyncio issue 222 / PR 231 (Victor Stinner) -- fix @coroutine functions without __nam...

diff --cc Misc/NEWS
index e2b61c35eff867fb80df2da86afe5fda6071c99e,24fc1507e0a6a7e5aaae1e08dce1c08ad54f72ed..c189db7fceeb7236b5df2324c80fae4514e90be7
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -101,30 -39,30 +101,57 @@@ Core and Builtin
  Library
  -------
  
++<<<<<<< local
 +- Issue #16914: new debuglevel 2 in smtplib adds timestamps to debug output.
 +
 +- Issue #7159: urllib.request now supports sending auth credentials
 +  automatically after the first 401.  This enhancement is a superset of the
 +  enhancement from issue #19494 and supersedes that change.
 +
 +- Issue #23703: Fix a regression in urljoin() introduced in 901e4e52b20a.
 +  Patch by Demian Brecht.
 +
 +- Issue #4254: Adds _curses.update_lines_cols() Patch by Arnon Yaari
 +
 +- Issue 19933: Provide default argument for ndigits in round. Patch by
 +  Vajrasky Kok.
 +
 +- Issue #23193: Add a numeric_owner parameter to
 +  tarfile.TarFile.extract and tarfile.TarFile.extractall. Patch by
 +  Michael Vogt and Eric Smith.
 +
 +- Issue #23342: Add a subprocess.run() function than returns a CalledProcess
 +  instance for a more consistent API than the existing call* functions.
 +
 +- Issue #21217: inspect.getsourcelines() now tries to compute the start and end
 +  lines from the code object, fixing an issue when a lambda function is used as
 +  decorator argument. Patch by Thomas Ballinger and Allison Kaptur.
++=======
+ - Asyncio issue 222 / PR 231 (Victor Stinner) -- fix @coroutine
+   functions without __name__.
+ 
+ - Issue #9246: On POSIX, os.getcwd() now supports paths longer than 1025 bytes.
+   Patch written by William Orr.
+ 
+ - Issues #24099, #24100, and #24101: Fix free-after-use bug in heapq's siftup
+   and siftdown functions.
+ 
+ - 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 #23008: Fixed resolving attributes with boolean value is False in pydoc.
+ 
+ - 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 #23908: os functions now reject paths with embedded null character
+   on Windows instead of silently truncate them.
+ 
+ - Issue #23728: binascii.crc_hqx() could return an integer outside of the range
+   0-0xffff for empty data.
++>>>>>>> other
  
  - Issue #23811: Add missing newline to the PyCompileError error message.
    Patch by Alex Shkop.