[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#23872)

[benjamin.peterson]

https://hg.python.org/cpython/rev/2c89c1c34e19
changeset:   95447:2c89c1c34e19
parent:      95445:6d9520e2223f
parent:      95446:cc2c7aa2d7a6
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Apr 05 10:03:23 2015 -0400
summary:
  merge 3.4 (#23872)

files:
  Lib/smtpd.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/smtpd.py b/Lib/smtpd.py
--- a/Lib/smtpd.py
+++ b/Lib/smtpd.py
@@ -462,7 +462,7 @@
 
     def smtp_HELP(self, arg):
         if arg:
-            extended = ' [SP <mail parameters]'
+            extended = ' [SP <mail-parameters>]'
             lc_arg = arg.upper()
             if lc_arg == 'EHLO':
                 self.push('250 Syntax: EHLO hostname')

-- 
Repository URL: https://hg.python.org/cpython