From d6b042ec883744e268e1d7cdb7bbb15c07438947 Mon Sep 17 00:00:00 2001
From: ced <>
Date: Wed, 20 Jun 2007 05:29:23 +0000
Subject: [PATCH] CRM: fix mailgate script to be more fault tolerant

bzr revid: ced-5844af190afda33037416682852e2b58f3d1e5c5
---
 addons/crm/scripts/tinyerp-mailgate/Makefile            | 5 -----
 addons/crm/scripts/tinyerp-mailgate/fetchmailrc         | 5 -----
 addons/crm/scripts/tinyerp-mailgate/tinyerp-mailgate.py | 4 +++-
 3 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 100644 addons/crm/scripts/tinyerp-mailgate/Makefile
 delete mode 100755 addons/crm/scripts/tinyerp-mailgate/fetchmailrc

diff --git a/addons/crm/scripts/tinyerp-mailgate/Makefile b/addons/crm/scripts/tinyerp-mailgate/Makefile
deleted file mode 100644
index a5f91efa090..00000000000
--- a/addons/crm/scripts/tinyerp-mailgate/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-test:
-	fetchmail -f ./fetchmailrc -v -k
-
-test_sm:
-	/usr/lib/sendmail fp@tiny.be <mail.txt
diff --git a/addons/crm/scripts/tinyerp-mailgate/fetchmailrc b/addons/crm/scripts/tinyerp-mailgate/fetchmailrc
deleted file mode 100755
index 29cffd72277..00000000000
--- a/addons/crm/scripts/tinyerp-mailgate/fetchmailrc
+++ /dev/null
@@ -1,5 +0,0 @@
-# .fetchmailrc
-
-poll pop.tiny.be proto pop3:
-username testcli@tiny.be password tiny mda "/home/pinky/code/terp/trunk/server/bin/addons/crm/scripts/tinyerp-mailgate/tinyerp-mailgate.py -u3 -padmin -ssupport -etestcli@tiny.be -mfp@tiny.be -dterp"
-
diff --git a/addons/crm/scripts/tinyerp-mailgate/tinyerp-mailgate.py b/addons/crm/scripts/tinyerp-mailgate/tinyerp-mailgate.py
index f93f387a48d..2796934d079 100755
--- a/addons/crm/scripts/tinyerp-mailgate/tinyerp-mailgate.py
+++ b/addons/crm/scripts/tinyerp-mailgate/tinyerp-mailgate.py
@@ -127,7 +127,9 @@ class email_parser(object):
 				continue
 
 			if part.get_content_maintype()=='text' and part.get_content_subtype() == 'plain':
-				message['body'] += part.get_payload(decode=True).decode(part.get_charsets()[0])
+				buf = part.get_payload(decode=True)
+				if buf:
+					message['body'] += buf.decode(part.get_charsets()[0] or 'ascii', 'replace')
 			elif part.get_content_maintype()=='application' or part.get_content_maintype()=='image' or part.get_content_maintype()=='text':
 				filename = part.get_filename();
 				if filename :