GnuPG/__init__.py

@@ -102,6 +102,8 @@ def confirm_key( content, email ):
 
 # adds a key and ensures it has the given email address
 def add_key( keyhome, content ):
+	if type(content) == 'str':
+		content = bytes(content, sys.getdefaultencoding())
 	p = subprocess.Popen( build_command(keyhome, '--import', '--batch'), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE )
 	p.communicate(input=content)
 	p.wait()

gpg-mailgate-web/cron.py

@@ -25,7 +25,7 @@ import MySQLdb
 import smtplib
 import markdown
 import syslog
-from email.MIMEText import MIMEText
+from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 
 def appendLog(msg):