Kolab Groupware OBS

Changes of Revision 13

pykolab-0.9.0.tar.gz/wallace/__init__.py Changed

@@ -154,8 +154,9 @@
             break
 
 
-class WallaceSMTPChannel(_smtpd.SMTPChannel):
+class WallaceSMTPChannel(smtpd.SMTPChannel):
     callback = None
+
     def __init__(self, connection, address, callback):
         self.callback = callback
         if conf.debuglevel > 8:
@@ -163,9 +164,8 @@
         super().__init__(self, connection, address)
 
     def data_header(self, mailfrom, rcpttos):
-        COMMASPACE = ', '
         return "X-Kolab-From: " + mailfrom + "\r\n" + \
-            "X-Kolab-To: " + COMMASPACE.join(rcpttos) + "\r\n"
+            "X-Kolab-To: " + ', '.join(rcpttos) + "\r\n"
 
     def process_message(self, peer, mailfrom, rcpttos, data, **kwargs):
         """
@@ -182,7 +182,7 @@
             # we should make sure there's only one line separator between
             # kolab headers and the original message (data)
             os.write(fp, bytes(header.encode("UTF-8")))
-            os.write(fp, bytes(data.encode("UTF-8")))
+            os.write(fp, data)
         except Exception as errmsg:
             log.warning(
                 _l("failed to write to file: %s" % (errmsg))
@@ -190,7 +190,6 @@
         finally:
             os.close(fp)
 
-        log.debug(_l("Started processing accepted message %s") % filename, level=8)
         self.callback(filename)
 
         return "250 OK Message %s queued" % (filename)