First decode and encode utf-8 before falling back to chardet

nylas · Aug 4, 2020 · 29e9ec5 · 29e9ec5
1 parent f60807f
commit 29e9ec5
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/exchangelib/util.py b/exchangelib/util.py
@@ -516,7 +516,10 @@ def post_ratelimited(protocol, session, url, headers, data, allow_redirects=Fals
             except UnicodeDecodeError:
                 import chardet
                 encoding_info = chardet.detect(data)
-                data = data.decode('utf-8').encode(encoding_info['encoding'])
+                if encoding_info['encoding'] in ['ISO-8859-1', 'Windows-1252']:
+                    data = data.decode("utf-8").encode("utf-8")
+                else:
+                    data = data.decode('utf-8').encode(encoding_info['encoding'])
             try:
                 r = session.post(url=url,
                                  headers=headers,