diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-05-29 10:25:32 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-05-29 10:25:32 -0300 |
| commit | 9a5a325831230687a7da4ad5300c99f03aebba72 (patch) | |
| tree | 6569fff23c2c553b55f624e9db1744b6cf943330 /src/leap/mail/smtp | |
| parent | e5fa0790f5231c333aba4bc5f6766556e062aa6c (diff) | |
| parent | efed933415a2f6dead78dd6deca0f2383c889f3f (diff) | |
Merge remote-tracking branch 'kali/bug/imap-service-use-defer-to-thread' into develop
Diffstat (limited to 'src/leap/mail/smtp')
| -rw-r--r-- | src/leap/mail/smtp/__init__.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/leap/mail/smtp/__init__.py b/src/leap/mail/smtp/__init__.py index ace79b5..daa7ccf 100644 --- a/src/leap/mail/smtp/__init__.py +++ b/src/leap/mail/smtp/__init__.py @@ -15,18 +15,15 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. - """ SMTP relay helper function. """ - -from twisted.application import internet, service from twisted.internet import reactor -from leap import soledad -from leap.common.keymanager import KeyManager +#from leap import soledad +#from leap.common.keymanager import KeyManager from leap.mail.smtp.smtprelay import SMTPFactory |