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

diff --cc Misc/NEWS
index 9a7a85ae0306fe2c053cf2740e9965bea19a2656,8113dd36a68a240ac4d8623460d66157a0527979..293d551f465dd0a5a9ad3e23dca2e2657e872eac
--- 1/Misc/NEWS
--- 2/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.