comparison hgext/patchbomb.py @ 43576:14b96072797d

mail: let addressencode() / addrlistencode() return native strings

Avoids conversion to "str" on py3.

43575:67b4439c09b2

        m[b'User-Agent'] = b'Mercurial-patchbomb/%s' % util.version()
        m[b'Date'] = eutil.formatdate(start_time[0], localtime=True)

        start_time = (start_time[0] + 1, start_time[1])
        m[b'From'] = sender
        m[b'To'] = b', '.join(to)
        if cc:
            m[b'Cc'] = b', '.join(cc)
        if bcc:
            m[b'Bcc'] = b', '.join(bcc)
        if replyto:
            m[b'Reply-To'] = b', '.join(replyto)
        # Fix up all headers to be native strings.
        # TODO(durin42): this should probably be cleaned up above in the future.
        if pycompat.ispy3:
            for hdr, val in list(m.items()):
                change = False

                del m[b'Bcc']
            fp = stringio()
            generator = mail.Generator(fp, mangle_from_=False)
            generator.flatten(m, 0)
            alldests = to + bcc + cc
            alldests = [encoding.strfromlocal(d) for d in alldests]
            sendmail(sender_addr, alldests, fp.getvalue())

    progress.complete()

43576:14b96072797d

        m[b'User-Agent'] = b'Mercurial-patchbomb/%s' % util.version()
        m[b'Date'] = eutil.formatdate(start_time[0], localtime=True)

        start_time = (start_time[0] + 1, start_time[1])
        m[b'From'] = sender
        m[b'To'] = ', '.join(to)
        if cc:
            m[b'Cc'] = ', '.join(cc)
        if bcc:
            m[b'Bcc'] = ', '.join(bcc)
        if replyto:
            m[b'Reply-To'] = ', '.join(replyto)
        # Fix up all headers to be native strings.
        # TODO(durin42): this should probably be cleaned up above in the future.
        if pycompat.ispy3:
            for hdr, val in list(m.items()):
                change = False

                del m[b'Bcc']
            fp = stringio()
            generator = mail.Generator(fp, mangle_from_=False)
            generator.flatten(m, 0)
            alldests = to + bcc + cc
            sendmail(sender_addr, alldests, fp.getvalue())

    progress.complete()