In rcpt(), avoid a space after the TO: address when the option list is

empty.  Make sure there is a space when there are options.

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index 264eafb157045d1d79c78c7d81d82d368902ff6b..ebaf7f216f5d754b9f6f049d48241b0e974977de 100755 (executable)
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -294,8 +294,8 @@ class SMTP:
         """SMTP 'rcpt' command -- indicates 1 recipient for this mail."""
         optionlist = ''
         if options and self.does_esmtp:
-            optionlist = string.join(options, ' ')
-        self.putcmd("rcpt","TO:%s %s" % (quoteaddr(recip),optionlist))
+            optionlist = ' ' + string.join(options, ' ')
+        self.putcmd("rcpt","TO:%s%s" % (quoteaddr(recip),optionlist))
         return self.getreply()
 
     def data(self,msg):