changeset 380:f91064250ea7

cfg.mail_smarthost = 'server:port' support imported from: moin--main--1.5--patch-384
author Thomas Waldmann <tw@waldmann-edv.de>
date Mon, 16 Jan 2006 00:46:43 +0000
parents 7034d570abeb
children f0ecf4656a58
files ChangeLog MoinMoin/util/mail.py docs/CHANGES
diffstat 3 files changed, 18 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Jan 15 23:06:22 2006 +0000
+++ b/ChangeLog	Mon Jan 16 00:46:43 2006 +0000
@@ -2,6 +2,20 @@
 # arch-tag: automatic-ChangeLog--arch@arch.thinkmo.de--2003-archives/moin--main--1.5
 #
 
+2006-01-16 01:46:43 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-384
+
+    Summary:
+      cfg.mail_smarthost = 'server:port' support
+    Revision:
+      moin--main--1.5--patch-384
+
+    cfg.mail_smarthost = 'server:port' support
+    
+
+    modified files:
+     ChangeLog MoinMoin/util/mail.py docs/CHANGES
+
+
 2006-01-16 00:06:22 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-383
 
     Summary:
--- a/MoinMoin/util/mail.py	Sun Jan 15 23:06:22 2006 +0000
+++ b/MoinMoin/util/mail.py	Mon Jan 16 00:46:43 2006 +0000
@@ -96,7 +96,8 @@
     # Send the message
     if not cfg.mail_sendmail:
         try:
-            server = smtplib.SMTP(cfg.mail_smarthost)
+            host, port = (cfg.mail_smarthost + ':25').split(':')[:2]
+            server = smtplib.SMTP(host, int(port))
             try:
                 #server.set_debuglevel(1)
                 if cfg.mail_login:
--- a/docs/CHANGES	Sun Jan 15 23:06:22 2006 +0000
+++ b/docs/CHANGES	Mon Jan 16 00:46:43 2006 +0000
@@ -23,6 +23,8 @@
     * attachment:file%20with%20spaces.txt in attachment list
     * added support for file:// in GUI editor link dialogue, see also:
       MoinMoin:FileLinks
+    * cfg.mail_smarthost now supports "server:port" syntax, the default port
+      is 25, of course.
 
 
 Version 1.5.0: