Parse email messages from binary files.

Fixes #24

(see also gh#python/cpython#69731 and gh#python/cpython#85479)

2 files changed, 4 insertions, 4 deletions

diff --git a/mail2news.py b/mail2news.py
index b19b619..eae03b0 100644
--- a/mail2news.py
+++ b/mail2news.py
@@ -66,14 +66,14 @@ class mail2news(object):
             msg[header] = value.strip()
 
     def __readfile(self, opt):
-        message = email.message_from_file(sys.stdin)
+        message = email.message_from_binary_file(sys.stdin.buffer)
 
         if (len(message) == 0) \
                 and message.get_payload().startswith('/'):
             msg_file_name = message.get_payload().strip()
             del message
-            with open(msg_file_name, 'r') as msg_file:
-                message = email.message_from_file(msg_file)
+            with open(msg_file_name, 'rb') as msg_file:
+                message = email.message_from_binary_file(msg_file)
 
         # introduce nntpheads
         self.__add_header('Newsgroups', opt.newsgroup, message)
diff --git a/news2mail.py b/news2mail.py
index b9eaead..aff57e0 100644
--- a/news2mail.py
+++ b/news2mail.py
@@ -52,7 +52,7 @@ class news2mail(object):
 
         self.heads_dict = {}
         self.article, self.headers, self.body = [], [], []
-        self.message = self.__addheads(email.message_from_file(sys.stdin))
+        self.message = self.__addheads(email.message_from_binary_file(sys.stdin.buffer))
 
     def __addheads(self, msg):
         """add new header like X-Gateway: Received: