x509 fixes and plugins

plugins/email_requests/qt.py

@@ -23,8 +23,6 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from __future__ import absolute_import
-
 import time
 import threading
 import base64
@@ -33,9 +31,9 @@ from functools import partial
 import smtplib
 import imaplib
 import email
-from email.MIMEMultipart import MIMEMultipart
-from email.MIMEBase import MIMEBase
-from email import Encoders
+from email.mime.multipart import MIMEMultipart
+from email.mime.base import MIMEBase
+from email.encoders import encode_base64
 
 from PyQt4.QtGui import *
 from PyQt4.QtCore import *
@@ -49,7 +47,6 @@ from electrum_gui.qt.util import EnterButton, Buttons, CloseButton
 from electrum_gui.qt.util import OkButton, WindowModalDialog
 
 
-
 class Processor(threading.Thread):
     polling_interval = 5*60
 
@@ -96,7 +93,7 @@ class Processor(threading.Thread):
         msg['From'] = self.username
         part = MIMEBase('application', "bitcoin-paymentrequest")
         part.set_payload(payment_request)
-        Encoders.encode_base64(part)
+        encode_base64(part)
         part.add_header('Content-Disposition', 'attachment; filename="payreq.btc"')
         msg.attach(part)
         s = smtplib.SMTP_SSL(self.imap_server, timeout=2)