diff -r cf59de802883 -r 7b12a2d2eedc mercurial/pycompat.py
--- a/mercurial/pycompat.py	Sat Jun 16 17:56:37 2018 +0900
+++ b/mercurial/pycompat.py	Sat Jun 16 19:31:07 2018 +0900
@@ -295,10 +295,6 @@
         ret = shlex.split(s.decode('latin-1'), comments, posix)
         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
 
@@ -371,10 +367,6 @@
     rawinput = raw_input
     getargspec = inspect.getargspec
 
-    def emailparser(*args, **kwargs):
-        import email.parser
-        return email.parser.Parser(*args, **kwargs)
-
 isjython = sysplatform.startswith('java')
 
 isdarwin = sysplatform == 'darwin'