summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1c3a06c)
raw | patch | inline | side by side (parent: 1c3a06c)
author | richard <richard@57a73879-2fb5-44c3-a270-3262357dd7e2> | |
Thu, 24 Apr 2003 07:22:08 +0000 (07:22 +0000) | ||
committer | richard <richard@57a73879-2fb5-44c3-a270-3262357dd7e2> | |
Thu, 24 Apr 2003 07:22:08 +0000 (07:22 +0000) |
git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1681 57a73879-2fb5-44c3-a270-3262357dd7e2
roundup/mailgw.py | patch | blob | history |
diff --git a/roundup/mailgw.py b/roundup/mailgw.py
index 89dd29fc70dd520b8b58353cb6dc6261fab7b585..b78d2948463bad7a66b9c10f469aa9db2258abcf 100644 (file)
--- a/roundup/mailgw.py
+++ b/roundup/mailgw.py
an exception, the original message is bounced back to the sender with the
explanatory message given in the exception.
-$Id: mailgw.py,v 1.118 2003-04-24 07:19:58 richard Exp $
+$Id: mailgw.py,v 1.119 2003-04-24 07:22:08 richard Exp $
'''
import string, re, os, mimetools, cStringIO, smtplib, socket, binascii, quopri
use_tls = getattr(config, 'MAILHOST_TLS', 'no')
if use_tls == 'yes'
# do we have key files too?
- keyfile = getattr(config, 'MAILHOST_TLS_KEYFILE', None)
- if keyfile is not None:
- certfile = getattr(config, 'MAILHOST_TLS_CERTFILE', None)
- if certfile is not None:
+ keyfile = getattr(config, 'MAILHOST_TLS_KEYFILE', '')
+ if keyfile:
+ certfile = getattr(config, 'MAILHOST_TLS_CERTFILE', '')
+ if certfile:
args = (keyfile, certfile)
else:
args = (keyfile, )