From: W. Trevor King <wking@drexel.edu>
Date: Sat, 18 Jul 2009 21:02:11 +0000 (-0400)
Subject: Assorted bugfixes to get reworked be-handle-mail working.
X-Git-Tag: v0.2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ece31308b17d3699abc1ef70ad476e997239a0d4;p=pgp-mime.git

Assorted bugfixes to get reworked be-handle-mail working.
---

diff --git a/interfaces/email/interactive/send_pgp_mime.py b/interfaces/email/interactive/send_pgp_mime.py
index 3a60013..babd720 100644
--- a/interfaces/email/interactive/send_pgp_mime.py
+++ b/interfaces/email/interactive/send_pgp_mime.py
@@ -212,7 +212,7 @@ def flatten(msg, to_unicode=False):
     g.flatten(msg)
     text = fp.getvalue()
     if to_unicode == True:
-        encoding = msg.get_content_charset()
+        encoding = msg.get_content_charset() or "utf-8"
         text = unicode(text, encoding=encoding)
     return text