Skip to content

Commit 2f56e9b

Browse files
author
Richard Jones
committed
get yer defaults right, mate
1 parent bada740 commit 2f56e9b

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

roundup/mailgw.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class node. Any parts of other types are each stored in separate files
7373
an exception, the original message is bounced back to the sender with the
7474
explanatory message given in the exception.
7575
76-
$Id: mailgw.py,v 1.118 2003-04-24 07:19:58 richard Exp $
76+
$Id: mailgw.py,v 1.119 2003-04-24 07:22:08 richard Exp $
7777
'''
7878

7979
import string, re, os, mimetools, cStringIO, smtplib, socket, binascii, quopri
@@ -141,10 +141,10 @@ def openSMTPConnection(config):
141141
use_tls = getattr(config, 'MAILHOST_TLS', 'no')
142142
if use_tls == 'yes'
143143
# do we have key files too?
144-
keyfile = getattr(config, 'MAILHOST_TLS_KEYFILE', None)
145-
if keyfile is not None:
146-
certfile = getattr(config, 'MAILHOST_TLS_CERTFILE', None)
147-
if certfile is not None:
144+
keyfile = getattr(config, 'MAILHOST_TLS_KEYFILE', '')
145+
if keyfile:
146+
certfile = getattr(config, 'MAILHOST_TLS_CERTFILE', '')
147+
if certfile:
148148
args = (keyfile, certfile)
149149
else:
150150
args = (keyfile, )

0 commit comments

Comments
 (0)