diff options
| author | Kali Kaneko <kali@leap.se> | 2015-08-03 14:27:48 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-08-03 14:27:48 -0400 |
| commit | a778140a3dfa2907d2e1d45cfa87ee3b2dd5329a (patch) | |
| tree | db4b3587b6295730e059279925cbb97fbdb7cb7b /src/leap/mail/smtp/__init__.py | |
| parent | f27ad9a3fdb2a6746ddb13fe4c117614c4b59364 (diff) | |
| parent | 5027dd2dd3c7679a7eea025d838a7d472c355623 (diff) | |
Merge remote-tracking branch 'leapcode/pr/188' into develop
Diffstat (limited to 'src/leap/mail/smtp/__init__.py')
| -rw-r--r-- | src/leap/mail/smtp/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/mail/smtp/__init__.py b/src/leap/mail/smtp/__init__.py index 3ef016b..2ff14d7 100644 --- a/src/leap/mail/smtp/__init__.py +++ b/src/leap/mail/smtp/__init__.py @@ -24,11 +24,11 @@ from twisted.internet import reactor from twisted.internet.error import CannotListenError from leap.mail.outgoing.service import OutgoingMail -logger = logging.getLogger(__name__) - from leap.common.events import emit, catalog from leap.mail.smtp.gateway import SMTPFactory +logger = logging.getLogger(__name__) + def setup_smtp_gateway(port, userid, keymanager, smtp_host, smtp_port, smtp_cert, smtp_key, encrypted_only): |