Skip to content

Commit f9c7332

Browse files
committed
improve non-ascii charset support in message body
1 parent aad5d37 commit f9c7332

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

email2slack.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ def parse(mime_mail):
4646
@staticmethod
4747
def extract_message(message):
4848
body = message.get_payload(decode=True)
49-
return message['Content-Type'], body.decode(encoding=chardet.detect(body)['encoding'])
49+
charset = chardet.detect(body)['encoding']
50+
if charset is None:
51+
charset = 'utf-8'
52+
53+
return message['Content-Type'], body.decode(encoding=charset)
5054

5155
@staticmethod
5256
def parse_header(parsed_mail, field: str) -> str:

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
setup(
1111
name='email2slack',
1212

13-
version='1.0.0a2',
13+
version='1.0.0a3',
1414

1515
description='MIME E-mail forwarding script for Slack written in Python',
1616
long_description=long_description,

0 commit comments

Comments
 (0)