--- a/mercurial/pycompat.py	Sun Feb 11 13:32:18 2018 -0800
+++ b/mercurial/pycompat.py	Sun Feb 11 14:17:23 2018 -0800
@@ -267,6 +267,10 @@
         ret = shlex.split(s.decode('latin-1'))
         return [a.encode('latin-1') for a in ret]
 
+    def emailparser(*args, **kwargs):
+        import email.parser
+        return email.parser.BytesParser(*args, **kwargs)
+
 else:
     import cStringIO
 
@@ -327,6 +331,10 @@
     ziplist = zip
     rawinput = raw_input
 
+    def emailparser(*args, **kwargs):
+        import email.parser
+        return email.parser.Parser(*args, **kwargs)
+
 isjython = sysplatform.startswith('java')
 
 isdarwin = sysplatform == 'darwin'