summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-07-03 14:13:42 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-07-03 14:13:42 (GMT)
commitb09b844a5c7bb41cf67af8aafe0682c3bfdc12da (patch)
tree09cb453d31b46761a3da71b09ec4927fdaf61373 /Misc
parent451a356f11d3ed498a359f94d85a7df5d6a2a843 (diff)
downloadcpython-b09b844a5c7bb41cf67af8aafe0682c3bfdc12da.zip
cpython-b09b844a5c7bb41cf67af8aafe0682c3bfdc12da.tar.gz
cpython-b09b844a5c7bb41cf67af8aafe0682c3bfdc12da.tar.bz2
Merged revisions 64688 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r64688 | martin.v.loewis | 2008-07-03 14:51:14 +0200 (Do, 03 Jul 2008) | 9 lines Patch #1622: Correct interpretation of various ZIP header fields. Also fixes - 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. ........
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS13
1 files changed, 13 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 9b3c35a..c977e45 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -17,8 +17,21 @@ 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