summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2012-07-23 02:32:44 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2012-07-23 02:32:44 (GMT)
commit7e918cfe2805f4556995885a14e684029c7c95ba (patch)
tree6ae529309f4a91bb7e1d1cff9abdaac792076a10 /Misc
parent28a9f2193ade4e0f12d3110d2f199b07f342eff8 (diff)
parent6a31bc6d81f42ac39868ced08d83cad880a7cce6 (diff)
downloadcpython-7e918cfe2805f4556995885a14e684029c7c95ba.zip
cpython-7e918cfe2805f4556995885a14e684029c7c95ba.tar.gz
cpython-7e918cfe2805f4556995885a14e684029c7c95ba.tar.bz2
merge heads.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS3
1 files changed, 3 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index d8a581b..ff7be30 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -98,6 +98,9 @@ Core and Builtins
Library
-------
+- Issue #15232: when mangle_from is True, email.Generator now correctly mangles
+ lines that start with 'From' that occur in a MIME preamble or epilogue.
+
- Issue #13922: argparse no longer incorrectly strips '--'s that appear
after the first one.