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

Lib/smtpd.py

@@ -137,8 +137,8 @@ class SMTPChannel(asynchat.async_chat):
         self.enable_SMTPUTF8 = enable_SMTPUTF8
         if enable_SMTPUTF8:
             if decode_data:
-                ValueError("decode_data and enable_SMTPUTF8 cannot be set to"
+                raise ValueError("decode_data and enable_SMTPUTF8 cannot"
-                           " True at the same time")
+                                 " be set to True at the same time")
             decode_data = False
         if decode_data is None:
             warn("The decode_data default of True will change to False in 3.6;"

Lib/test/test_smtpd.py

@@ -313,6 +313,12 @@ class SMTPDChannelTest(unittest.TestCase):
             DummyDispatcherBroken, BrokenDummyServer,
             (support.HOST, 0), ('b', 0), decode_data=True)
 
+    def test_decode_data_and_enable_SMTPUTF8_raises(self):
+        self.assertRaises(
+            ValueError, smtpd.SMTPChannel,
+            self.server, self.channel.conn, self.channel.addr,
+            enable_SMTPUTF8=True, decode_data=True)
+
     def test_server_accept(self):
         self.server.handle_accept()
 

Misc/NEWS

@@ -48,6 +48,9 @@ Core and Builtins
 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.