From 3b43af2b2f5ecd544e321399e295a69858ba83c2 Mon Sep 17 00:00:00 2001 From: inpos Date: Wed, 8 Jun 2016 23:09:12 +0300 Subject: [PATCH] ... --- mech_imap.py | 10 +++++----- serpent/config.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mech_imap.py b/mech_imap.py index 4b25fb0..7685993 100644 --- a/mech_imap.py +++ b/mech_imap.py @@ -118,15 +118,15 @@ class IMAPUserAccount(object): move(os.path.join(self.dir, old), os.path.join(self.dir, new)) IMAP_MBOX_REG[self.dir][new] = self._getMailbox(new) IMAP_MBOX_REG[self.dir][new].subscribe() - return IMAP_MBOX_REG[self.dir][newname] + return True def subscribe(self, name): if isinstance(name, unicode): name = name.encode('imap4-utf-7') if name in IMAP_MBOX_REG[self.dir].keys(): IMAP_MBOX_REG[self.dir][name].subscribe() - return True - raise imap4.NoSuchMailbox, name + return True + #raise imap4.NoSuchMailbox, name def unsubscribe(self, name): if name in conf.imap_auto_mbox: @@ -135,8 +135,8 @@ class IMAPUserAccount(object): name = name.encode('imap4-utf-7') if name in IMAP_MBOX_REG[self.dir].keys(): IMAP_MBOX_REG[self.dir][name].unsubscribe() - return True - raise imap4.NoSuchMailbox, name + return True + #raise imap4.NoSuchMailbox, name def isSubscribed(self, name): if isinstance(name, unicode): diff --git a/serpent/config.py b/serpent/config.py index f365764..9f86679 100644 --- a/serpent/config.py +++ b/serpent/config.py @@ -8,7 +8,7 @@ conf.SRVNAME = 'Serpent' conf.srv_version = '%s %s' % (conf.SRVNAME, conf.VERSION) conf.local_domains = ['dom.lan'] # Список доменов, для которых будет приниматься почта conf.tls = True -conf.tls_pem = './serpent.pem' +conf.tls_pem = u'./serpent.pem' conf.smtp_open_relay = False # Разрешить ли пересылку откуда угодно куда угодно conf.smtp_email_delim = '@' conf.smtp_header = '''from [{sender_ip}] (helo={sender_host})