traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix committed merge conflict.

This commit is contained in:
Georg Brandl 2008-07-04 15:45:10 +00:00
parent e7c78b26c6
commit 6e7196fb93
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Misc/NEWS
View File

@ -17,21 +17,8 @@ Core and Builtins
Library Library
------- -------
<<<<<<< .working
- Issue #2683: Fix inconsistency in subprocess.Popen.communicate(): the - Issue #2683: Fix inconsistency in subprocess.Popen.communicate(): the
argument now must be a bytes object in any case. argument now must be a bytes object in any case.
=======
- Issue #1622: Correct interpretation of various ZIP header fields.
- Issue #1526: Allow more than 64k files to be added to Zip64 file.
- Issue #1746: Correct handling of zipfile archive comments (previously
archives with comments over 4k were flagged as invalid). Allow writing
Zip files with archives by setting the 'comment' attribute of a ZipFile.
- Issue #449227: Now with the rlcompleter module, callable objects are added
"(" when completed.
>>>>>>> .merge-right.r64688
- Issue #3145: help("modules whatever") failed when trying to load the source - Issue #3145: help("modules whatever") failed when trying to load the source
code of every single module of the standard library, including invalid files code of every single module of the standard library, including invalid files