From 5168c88c1782c37761fecbf4c469538bc404ea24 Mon Sep 17 00:00:00 2001 From: Vincent Ardisson Date: Thu, 26 Dec 2019 14:11:53 +0100 Subject: [PATCH] weboob.applications: use some python3 imports for email/io --- weboob/applications/boobtracker/boobtracker.py | 2 +- weboob/applications/boomoney/boomoney.py | 12 ++++++------ weboob/applications/monboob/monboob.py | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/weboob/applications/boobtracker/boobtracker.py b/weboob/applications/boobtracker/boobtracker.py index 8b82ac8865..d167feeae2 100644 --- a/weboob/applications/boobtracker/boobtracker.py +++ b/weboob/applications/boobtracker/boobtracker.py @@ -21,7 +21,7 @@ from datetime import timedelta from email import message_from_string, message_from_file -from email.Header import decode_header +from email.header import decode_header from email.mime.text import MIMEText from smtplib import SMTP import os diff --git a/weboob/applications/boomoney/boomoney.py b/weboob/applications/boomoney/boomoney.py index ee51b1ab27..18f9afeaac 100644 --- a/weboob/applications/boomoney/boomoney.py +++ b/weboob/applications/boomoney/boomoney.py @@ -27,7 +27,7 @@ from threading import Thread, Lock import copy import sys -import StringIO +from io import StringIO import os import re import subprocess @@ -163,7 +163,7 @@ def run(self): self.boomoney.importIndex = self.boomoney.importIndex + 1 return - boobank.stderr = StringIO.StringIO() + boobank.stderr = StringIO() boobank.stdout = boobank.stderr id, backend = self.account.split("@") module_name, foo = boobank.weboob.backends_config.get_backend(backend) @@ -176,7 +176,7 @@ def run(self): content = '' boobank.error = False while count <= MAX_RETRIES and not (found and not boobank.error): - boobank.options.outfile = StringIO.StringIO() + boobank.options.outfile = StringIO() boobank.error = False # executing history command @@ -205,8 +205,8 @@ def run(self): # postprocessing of the ofx content to match MSMoney expectations content = re.sub(r'Not loaded', r'', content) - input = StringIO.StringIO(content) - output = StringIO.StringIO() + input = StringIO(content) + output = StringIO() field = {} fields = ' ' for line in input: @@ -464,7 +464,7 @@ def save_config(self): def getList(self): self.onecmd("select id label") - self.options.outfile = StringIO.StringIO() + self.options.outfile = StringIO() self.onecmd("list") listContent = self.options.outfile.getvalue() self.options.outfile.close() diff --git a/weboob/applications/monboob/monboob.py b/weboob/applications/monboob/monboob.py index 7d6de2b2db..3690c4b973 100644 --- a/weboob/applications/monboob/monboob.py +++ b/weboob/applications/monboob/monboob.py @@ -21,8 +21,8 @@ from email.mime.text import MIMEText from smtplib import SMTP -from email.Header import Header, decode_header -from email.Utils import parseaddr, formataddr, formatdate +from email.header import Header, decode_header +from email.utils import parseaddr, formataddr, formatdate from email import message_from_file, message_from_string from smtpd import SMTPServer import time -- GitLab