From: R David Murray <rdmurray@bitdance.com>
Date: Fri, 9 Oct 2015 14:20:58 +0000 (-0400)
Subject: Merge #25328: add missing raise keyword in decode_data+SMTPUTF8 check.
X-Git-Tag: v3.6.0a1~1284
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aecf63ee3a4408e9a6186b08d924d1492234dbea;p=python

Merge #25328: add missing raise keyword in decode_data+SMTPUTF8 check.
---

aecf63ee3a4408e9a6186b08d924d1492234dbea
diff --cc Misc/NEWS
index 9a7a85ae03,8113dd36a6..293d551f46
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -48,9 -37,9 +48,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #25328: smtpd's SMTPChannel now correctly raises a ValueError if both
+   decode_data and enable_SMTPUTF8 are set to true.
+ 
 +- Issue #16099: RobotFileParser now supports Crawl-delay and Request-rate
 +  extensions.  Patch by Nikolay Bogoychev.
 +
  - Issue #25316: distutils raises OSError instead of DistutilsPlatformError
    when MSVC is not installed.