diff options
| author | Georg Brandl <georg@python.org> | 2008-07-04 15:45:10 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-07-04 15:45:10 (GMT) |
| commit | 6e7196fb933f24abc915e9c20b9fa676a04b82c5 (patch) | |
| tree | 331694aa3b2511580e1a70abcd5fd504d99f877a /Misc | |
| parent | e7c78b26c63728c0ebe081e2b9a1d9c543d2cc1d (diff) | |
| download | cpython-6e7196fb933f24abc915e9c20b9fa676a04b82c5.zip cpython-6e7196fb933f24abc915e9c20b9fa676a04b82c5.tar.gz cpython-6e7196fb933f24abc915e9c20b9fa676a04b82c5.tar.bz2 | |
Fix committed merge conflict.
Diffstat (limited to 'Misc')
| -rw-r--r-- | Misc/NEWS | 13 |
1 files changed, 0 insertions, 13 deletions
@@ -17,21 +17,8 @@ Core and Builtins Library ------- -<<<<<<< .working - Issue #2683: Fix inconsistency in subprocess.Popen.communicate(): the 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 code of every single module of the standard library, including invalid files |