mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-30 20:31:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

remove merge markers

Browse source
This commit is contained in:
Benjamin Peterson 2015-05-02 22:34:31 -04:00
parent 97bd4b0cd9
commit c9083bf1a1
1 changed files with 0 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Misc/NEWS
View file

@ -101,7 +101,6 @@ Core and Builtins
Library Library
------- -------
<<<<<<< local
- Issue #16914: new debuglevel 2 in smtplib adds timestamps to debug output. - Issue #16914: new debuglevel 2 in smtplib adds timestamps to debug output.
- Issue #7159: urllib.request now supports sending auth credentials - Issue #7159: urllib.request now supports sending auth credentials
@ -126,32 +125,6 @@ Library
- Issue #21217: inspect.getsourcelines() now tries to compute the start and end - 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 lines from the code object, fixing an issue when a lambda function is used as
decorator argument. Patch by Thomas Ballinger and Allison Kaptur. 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. - Issue #23811: Add missing newline to the PyCompileError error message.
Patch by Alex Shkop. Patch by Alex Shkop.