mail: delete conditional code for Python 2

Differential Revision: https://phab.mercurial-scm.org/D12286

mercurial/mail.py

@@ -467,9 +467,8 b' def mimeencode(ui, s, charsets=None, dis'
     return mimetextqp(s, 'plain', cs)
 
 
-if pycompat.ispy3:
+Generator = email.generator.BytesGenerator
 
-    Generator = email.generator.BytesGenerator
 
     def parse(fp):
         # type: (Any) -> email.message.Message
@@ -485,27 +484,13 b' if pycompat.ispy3:'
         finally:
             fp.detach()
 
+
     def parsebytes(data):
         # type: (bytes) -> email.message.Message
         ep = email.parser.BytesParser()
         return ep.parsebytes(data)
 
 
-else:
-
-    Generator = email.generator.Generator
-
-    def parse(fp):
-        # type: (Any) -> email.message.Message
-        ep = email.parser.Parser()
-        return ep.parse(fp)
-
-    def parsebytes(data):
-        # type: (str) -> email.message.Message
-        ep = email.parser.Parser()
-        return ep.parsestr(data)
-
-
 def headdecode(s):
     # type: (Union[email.header.Header, bytes]) -> bytes
     '''Decodes RFC-2047 header'''