parser: codec lookup fails when a NUL (\x00) is in the name

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@axtens.net>
Reviewed-by: Stephen Finucane <stephen@that.guru>

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