[PATCH 03/10] parser: codec lookup fails when a NUL (\x00) is in the name

Daniel Axtens dja at axtens.net
Wed Jun 28 17:48:45 AEST 2017

On Python3 this presents as a ValueError
On Python2 this presents as a TypeError

In both cases, catch these exceptions.

Signed-off-by: Daniel Axtens <dja at axtens.net>
 patchwork/parser.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patchwork/parser.py b/patchwork/parser.py
index 3ab4eb3d2011..19ed7ca4e315 100644
--- a/patchwork/parser.py
+++ b/patchwork/parser.py
@@ -436,7 +436,7 @@ def _find_content(mail):
             if charset is not None:
-                except LookupError:
+                except (LookupError, ValueError, TypeError):
                     charset = None
             # If there is no charset or if it is unknown, then try some common

More information about the Patchwork mailing list