##// END OF EJS Templates
stdio: add machinery to identify failed stdout/stderr writes...
stdio: add machinery to identify failed stdout/stderr writes Mercurial currently fails to notice failures to write to stdout or stderr. A correctly functioning command line tool should detect this and exit with an error code. To achieve this, we need a little extra plumbing, which we start adding here.

File last commit:

r31447:067add65 default
r31959:b445a3f0 default
Show More
mail.py
356 lines | 12.6 KiB | text/x-python | PythonLexer
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 # mail.py - mail sending bits for mercurial
#
# Copyright 2006 Matt Mackall <mpm@selenic.com>
#
Martin Geisler
updated license to be explicit about GPL version 2
r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889
Yuya Nishihara
mail: do not print(), use ui.debug() instead...
r30325 from __future__ import absolute_import
Gregory Szorc
mail: use absolute_import
r25957
Augie Fackler
mail: correct import of email module
r19790 import email
Gábor Stefanik
mail: take --encoding and HGENCODING into account...
r30089 import email.charset
Pulkit Goyal
mail: handle renamed email.Header...
r30072 import email.header
Gregory Szorc
mail: use absolute_import
r25957 import os
import quopri
import smtplib
import socket
import time
from .i18n import _
from . import (
encoding,
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 error,
Gregory Szorc
mail: use absolute_import
r25957 sslutil,
util,
)
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889
Pulkit Goyal
mail: handle renamed email.Header...
r30072 _oldheaderinit = email.header.Header.__init__
Nicolas Dumazet
mail: ensure that Python2.4 to 2.7 use the same header format...
r11542 def _unifiedheaderinit(self, *args, **kw):
"""
Mads Kiilerich
avoid using abbreviations that look like spelling errors
r17428 Python 2.7 introduces a backwards incompatible change
Nicolas Dumazet
mail: ensure that Python2.4 to 2.7 use the same header format...
r11542 (Python issue1974, r70772) in email.Generator.Generator code:
pre-2.7 code passed "continuation_ws='\t'" to the Header
constructor, and 2.7 removed this parameter.
Default argument is continuation_ws=' ', which means that the
timeless@mozdev.org
spelling: behaviour -> behavior
r26098 behavior is different in <2.7 and 2.7
Nicolas Dumazet
mail: ensure that Python2.4 to 2.7 use the same header format...
r11542
timeless@mozdev.org
spelling: behaviour -> behavior
r26098 We consider the 2.7 behavior to be preferable, but need
to have an unified behavior for versions 2.4 to 2.7
Nicolas Dumazet
mail: ensure that Python2.4 to 2.7 use the same header format...
r11542 """
# override continuation_ws
kw['continuation_ws'] = ' '
_oldheaderinit(self, *args, **kw)
Pulkit Goyal
py3: use setattr() to assign new class attribute...
r29192 setattr(email.header.Header, '__init__', _unifiedheaderinit)
Nicolas Dumazet
mail: ensure that Python2.4 to 2.7 use the same header format...
r11542
FUJIWARA Katsunori
smtp: add the class to verify the certificate of the SMTP server for STARTTLS...
r18885 class STARTTLS(smtplib.SMTP):
'''Derived class to verify the peer certificate for STARTTLS.
This class allows to pass any keyword arguments to SSL socket creation.
'''
Gregory Szorc
mail: remove use of sslkwargs
r29251 def __init__(self, ui, host=None, **kwargs):
FUJIWARA Katsunori
smtp: add the class to verify the certificate of the SMTP server for STARTTLS...
r18885 smtplib.SMTP.__init__(self, **kwargs)
Gregory Szorc
sslutil: remove ui from sslkwargs (API)...
r29248 self._ui = ui
timeless
mail: retain hostname for sslutil.wrapsocket (issue5203)...
r28935 self._host = host
FUJIWARA Katsunori
smtp: add the class to verify the certificate of the SMTP server for STARTTLS...
r18885
def starttls(self, keyfile=None, certfile=None):
if not self.has_extn("starttls"):
msg = "STARTTLS extension not supported by server"
raise smtplib.SMTPException(msg)
(resp, reply) = self.docmd("STARTTLS")
if resp == 220:
Yuya Nishihara
ssl: rename ssl_wrap_socket() to conform to our naming convention...
r25429 self.sock = sslutil.wrapsocket(self.sock, keyfile, certfile,
Gregory Szorc
sslutil: remove ui from sslkwargs (API)...
r29248 ui=self._ui,
Gregory Szorc
mail: remove use of sslkwargs
r29251 serverhostname=self._host)
FUJIWARA Katsunori
smtp: add the class to verify the certificate of the SMTP server for STARTTLS...
r18885 self.file = smtplib.SSLFakeFile(self.sock)
self.helo_resp = None
self.ehlo_resp = None
self.esmtp_features = {}
self.does_esmtp = 0
return (resp, reply)
timeless@mozdev.org
mail: drop python 2.5 support
r26673 class SMTPS(smtplib.SMTP):
'''Derived class to verify the peer certificate for SMTPS.
FUJIWARA Katsunori
smtp: add the class to verify the certificate of the SMTP server for SMTPS...
r18886
timeless@mozdev.org
mail: drop python 2.5 support
r26673 This class allows to pass any keyword arguments to SSL socket creation.
'''
Gregory Szorc
mail: remove use of sslkwargs
r29251 def __init__(self, ui, keyfile=None, certfile=None, host=None,
timeless
mail: retain hostname for sslutil.wrapsocket (issue5203)...
r28935 **kwargs):
timeless@mozdev.org
mail: drop python 2.5 support
r26673 self.keyfile = keyfile
self.certfile = certfile
smtplib.SMTP.__init__(self, **kwargs)
timeless
mail: retain hostname for sslutil.wrapsocket (issue5203)...
r28935 self._host = host
timeless@mozdev.org
mail: drop python 2.5 support
r26673 self.default_port = smtplib.SMTP_SSL_PORT
Gregory Szorc
sslutil: remove ui from sslkwargs (API)...
r29248 self._ui = ui
timeless@mozdev.org
mail: drop python 2.5 support
r26673
def _get_socket(self, host, port, timeout):
if self.debuglevel > 0:
Yuya Nishihara
mail: do not print(), use ui.debug() instead...
r30325 self._ui.debug('connect: %r\n' % (host, port))
timeless@mozdev.org
mail: drop python 2.5 support
r26673 new_socket = socket.create_connection((host, port), timeout)
new_socket = sslutil.wrapsocket(new_socket,
self.keyfile, self.certfile,
Gregory Szorc
sslutil: remove ui from sslkwargs (API)...
r29248 ui=self._ui,
Gregory Szorc
mail: remove use of sslkwargs
r29251 serverhostname=self._host)
timeless@mozdev.org
mail: drop python 2.5 support
r26673 self.file = smtplib.SSLFakeFile(new_socket)
return new_socket
FUJIWARA Katsunori
smtp: add the class to verify the certificate of the SMTP server for SMTPS...
r18886
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 def _smtp(ui):
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 '''build an smtp connection and return a function to send mail'''
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 local_hostname = ui.config('smtp', 'local_hostname')
Patrick Mezard
mail: fix regression when parsing unset smtp.tls option
r13244 tls = ui.config('smtp', 'tls', 'none')
Zhigang Wang
smtp: fix for server doesn't support starttls extension...
r13201 # backward compatible: when tls = true, we use starttls.
starttls = tls == 'starttls' or util.parsebool(tls)
smtps = tls == 'smtps'
Augie Fackler
mail: use safehasattr instead of hasattr
r14965 if (starttls or smtps) and not util.safehasattr(socket, 'ssl'):
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_("can't use TLS: Python SSL support not installed"))
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 mailhost = ui.config('smtp', 'host')
if not mailhost:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('smtp.host not configured - cannot send mail'))
FUJIWARA Katsunori
smtp: verify the certificate of the SMTP server for STARTTLS/SMTPS...
r18888 if smtps:
ui.note(_('(using smtps)\n'))
Gregory Szorc
mail: remove use of sslkwargs
r29251 s = SMTPS(ui, local_hostname=local_hostname, host=mailhost)
FUJIWARA Katsunori
smtp: verify the certificate of the SMTP server for STARTTLS/SMTPS...
r18888 elif starttls:
Gregory Szorc
mail: remove use of sslkwargs
r29251 s = STARTTLS(ui, local_hostname=local_hostname, host=mailhost)
FUJIWARA Katsunori
smtp: verify the certificate of the SMTP server for STARTTLS/SMTPS...
r18888 else:
s = smtplib.SMTP(local_hostname=local_hostname)
FUJIWARA Katsunori
smtp: use 465 as default port for SMTPS...
r19050 if smtps:
defaultport = 465
else:
defaultport = 25
mailport = util.getport(ui.config('smtp', 'port', defaultport))
timeless@mozdev.org
l10n: use %d instead of %s for numbers
r26778 ui.note(_('sending mail: smtp host %s, port %d\n') %
Alexis S. L. Carvalho
fix typo in mail.py
r2964 (mailhost, mailport))
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 s.connect(host=mailhost, port=mailport)
Zhigang Wang
smtp: fix for server doesn't support starttls extension...
r13201 if starttls:
ui.note(_('(using starttls)\n'))
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 s.ehlo()
s.starttls()
s.ehlo()
Gregory Szorc
mail: unsupport smtp.verifycert (BC)...
r29285 if starttls or smtps:
FUJIWARA Katsunori
smtp: verify the certificate of the SMTP server for STARTTLS/SMTPS...
r18888 ui.note(_('(verifying remote certificate)\n'))
Gregory Szorc
mail: unsupport smtp.verifycert (BC)...
r29285 sslutil.validatesocket(s.sock)
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 username = ui.config('smtp', 'username')
password = ui.config('smtp', 'password')
Arun Thomas
Patchbomb: Prompt password when using SMTP/TLS and no password in .hgrc....
r5749 if username and not password:
password = ui.getpass()
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 if username and password:
ui.note(_('(authenticating to mail server as %s)\n') %
(username))
David Soria Parra
email: Catch exceptions during send....
r9246 try:
s.login(username, password)
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except smtplib.SMTPException as inst:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(inst)
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 def send(sender, recipients, msg):
try:
return s.sendmail(sender, recipients, msg)
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except smtplib.SMTPRecipientsRefused as inst:
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 recipients = [r[1] for r in inst.recipients.values()]
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort('\n' + '\n'.join(recipients))
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except smtplib.SMTPException as inst:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(inst)
Bryan O'Sullivan
Backed out changeset dc6ed2736c81
r5947
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 return send
Bryan O'Sullivan
Backed out changeset dc6ed2736c81
r5947
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 def _sendmail(ui, sender, recipients, msg):
'''send mail using sendmail.'''
Matt Mackall
email: fix config default value inconsistency
r25842 program = ui.config('email', 'method', 'smtp')
Matt Mackall
templater: move email function to util
r5975 cmdline = '%s -f %s %s' % (program, util.email(sender),
' '.join(map(util.email, recipients)))
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 ui.note(_('sending mail: %s\n') % cmdline)
Dirkjan Ochtman
replace usage of os.popen() with util.popen()...
r6548 fp = util.popen(cmdline, 'w')
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 fp.write(msg)
ret = fp.close()
if ret:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort('%s %s' % (
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 os.path.basename(program.split(None, 1)[0]),
Adrian Buehlmann
rename explain_exit to explainexit
r14234 util.explainexit(ret)[0]))
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889
Mads Kiilerich
mail: mbox handling as a part of mail handling, refactored from patchbomb
r15560 def _mbox(mbox, sender, recipients, msg):
'''write mails to mbox'''
fp = open(mbox, 'ab+')
# Should be time.asctime(), but Windows prints 2-characters day
# of month instead of one. Make them print the same thing.
date = time.strftime('%a %b %d %H:%M:%S %Y', time.localtime())
fp.write('From %s %s\n' % (sender, date))
fp.write(msg)
fp.write('\n\n')
fp.close()
def connect(ui, mbox=None):
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 '''make a mail connection. return a function to send mail.
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889 call as sendmail(sender, list-of-recipients, msg).'''
Mads Kiilerich
mail: mbox handling as a part of mail handling, refactored from patchbomb
r15560 if mbox:
open(mbox, 'wb').close()
return lambda s, r, m: _mbox(mbox, s, r, m)
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 if ui.config('email', 'method', 'smtp') == 'smtp':
Bryan O'Sullivan
Backed out changeset dc6ed2736c81
r5947 return _smtp(ui)
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 return lambda s, r, m: _sendmail(ui, s, r, m)
Matt Mackall
Move ui.sendmail to mail.connect/sendmail
r2889
Mads Kiilerich
notify: add option for writing to mbox...
r15561 def sendmail(ui, sender, recipients, msg, mbox=None):
send = connect(ui, mbox=mbox)
Matt Mackall
patchbomb: undo backout and fix bugs in the earlier patch
r5973 return send(sender, recipients, msg)
Bryan O'Sullivan
patchbomb: Validate email config before we start prompting for info.
r4489
def validateconfig(ui):
'''determine if we have enough config data to try sending email.'''
method = ui.config('email', 'method', 'smtp')
if method == 'smtp':
if not ui.config('smtp', 'host'):
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('smtp specified as email transport, '
Bryan O'Sullivan
patchbomb: Validate email config before we start prompting for info.
r4489 'but no smtp host configured'))
else:
Adrian Buehlmann
rename util.find_exe to findexe
r14271 if not util.findexe(method):
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('%r specified as email transport, '
Bryan O'Sullivan
patchbomb: Validate email config before we start prompting for info.
r4489 'but not in PATH') % method)
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114
Gábor Stefanik
mail: take --encoding and HGENCODING into account...
r30089 def codec2iana(cs):
''''''
cs = email.charset.Charset(cs).input_charset.lower()
# "latin1" normalizes to "iso8859-1", standard calls for "iso-8859-1"
if cs.startswith("iso") and not cs.startswith("iso-"):
return "iso-" + cs[3:]
return cs
Christian Ebert
mail: mime-encode patches that are utf-8...
r7191 def mimetextpatch(s, subtype='plain', display=False):
Mads Kiilerich
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)...
r15562 '''Return MIME message suitable for a patch.
Gábor Stefanik
mail: take --encoding and HGENCODING into account...
r30089 Charset will be detected by first trying to decode as us-ascii, then utf-8,
and finally the global encodings. If all those fail, fall back to
ISO-8859-1, an encoding with that allows all byte sequences.
Mads Kiilerich
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)...
r15562 Transfer encodings will be used if necessary.'''
Rocco Rutte
patchbomb: quoted-printable encode overly long lines...
r8332
Gábor Stefanik
mail: take --encoding and HGENCODING into account...
r30089 cs = ['us-ascii', 'utf-8', encoding.encoding, encoding.fallbackencoding]
if display:
return mimetextqp(s, subtype, 'us-ascii')
for charset in cs:
Rocco Rutte
patchbomb: quoted-printable encode overly long lines...
r8332 try:
Gábor Stefanik
mail: take --encoding and HGENCODING into account...
r30089 s.decode(charset)
return mimetextqp(s, subtype, codec2iana(charset))
Rocco Rutte
patchbomb: quoted-printable encode overly long lines...
r8332 except UnicodeDecodeError:
Gábor Stefanik
mail: take --encoding and HGENCODING into account...
r30089 pass
Rocco Rutte
patchbomb: quoted-printable encode overly long lines...
r8332
Gábor Stefanik
mail: take --encoding and HGENCODING into account...
r30089 return mimetextqp(s, subtype, "iso-8859-1")
Mads Kiilerich
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)...
r15562
def mimetextqp(body, subtype, charset):
'''Return MIME message.
Mads Kiilerich
fix trivial spelling errors
r17424 Quoted-printable transfer encoding will be used if necessary.
Mads Kiilerich
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)...
r15562 '''
enc = None
for line in body.splitlines():
if len(line) > 950:
body = quopri.encodestring(body)
enc = "quoted-printable"
break
msg = email.MIMEText.MIMEText(body, subtype, charset)
Rocco Rutte
patchbomb: quoted-printable encode overly long lines...
r8332 if enc:
del msg['Content-Transfer-Encoding']
msg['Content-Transfer-Encoding'] = enc
return msg
Christian Ebert
mail: mime-encode patches that are utf-8...
r7191
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 def _charsets(ui):
'''Obtains charsets to send mail parts not containing patches.'''
charsets = [cs.lower() for cs in ui.configlist('email', 'charsets')]
Matt Mackall
move encoding bits from util to encoding...
r7948 fallbacks = [encoding.fallbackencoding.lower(),
encoding.encoding.lower(), 'utf-8']
Martin Geisler
mail: updated comment
r8343 for cs in fallbacks: # find unique charsets while keeping order
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 if cs not in charsets:
charsets.append(cs)
return [cs for cs in charsets if not cs.endswith('ascii')]
def _encode(ui, s, charsets):
'''Returns (converted) string, charset tuple.
Finds out best charset by cycling through sendcharsets in descending
Matt Mackall
move encoding bits from util to encoding...
r7948 order. Tries both encoding and fallbackencoding for input. Only as
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 last resort send as is in fake ascii.
Caveat: Do not use for mail parts containing patches!'''
try:
s.decode('ascii')
except UnicodeDecodeError:
sendcharsets = charsets or _charsets(ui)
Matt Mackall
move encoding bits from util to encoding...
r7948 for ics in (encoding.encoding, encoding.fallbackencoding):
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 try:
u = s.decode(ics)
except UnicodeDecodeError:
continue
for ocs in sendcharsets:
try:
return u.encode(ocs), ocs
except UnicodeEncodeError:
pass
except LookupError:
Christian Ebert
mail: correct typo in variable name
r7195 ui.warn(_('ignoring invalid sendcharset: %s\n') % ocs)
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 # if ascii, or all conversion attempts fail, send (broken) ascii
return s, 'us-ascii'
def headencode(ui, s, charsets=None, display=False):
'''Returns RFC-2047 compliant header from given string.'''
if not display:
# split into words?
s, cs = _encode(ui, s, charsets)
Pulkit Goyal
mail: handle renamed email.Header...
r30072 return str(email.header.Header(s, cs))
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 return s
Marti Raudsepp
mail: add parseaddrlist() function for parsing many addresses at once...
r9948 def _addressencode(ui, name, addr, charsets=None):
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 name = headencode(ui, name, charsets)
try:
acc, dom = addr.split('@')
acc = acc.encode('ascii')
Marti Raudsepp
patchbomb: fix handling of email addresses with Unicode domains (IDNA)...
r9715 dom = dom.decode(encoding.encoding).encode('idna')
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 addr = '%s@%s' % (acc, dom)
except UnicodeDecodeError:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('invalid email address: %s') % addr)
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 except ValueError:
try:
# too strict?
addr = addr.encode('ascii')
except UnicodeDecodeError:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('invalid local address: %s') % addr)
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 return email.Utils.formataddr((name, addr))
Marti Raudsepp
mail: add parseaddrlist() function for parsing many addresses at once...
r9948 def addressencode(ui, address, charsets=None, display=False):
'''Turns address into RFC-2047 compliant header.'''
if display or not address:
return address or ''
name, addr = email.Utils.parseaddr(address)
return _addressencode(ui, name, addr, charsets)
def addrlistencode(ui, addrs, charsets=None, display=False):
'''Turns a list of addresses into a list of RFC-2047 compliant headers.
A single element of input list may contain multiple addresses, but output
always has one address per item'''
if display:
return [a.strip() for a in addrs if a.strip()]
result = []
for name, addr in email.Utils.getaddresses(addrs):
if name or addr:
result.append(_addressencode(ui, name, addr, charsets))
return result
Christian Ebert
mail: add methods to handle non-ascii chars...
r7114 def mimeencode(ui, s, charsets=None, display=False):
'''creates mime text object, encodes it if needed, and sets
charset and transfer-encoding accordingly.'''
cs = 'us-ascii'
if not display:
s, cs = _encode(ui, s, charsets)
Mads Kiilerich
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)...
r15562 return mimetextqp(s, 'plain', cs)
Julien Cristau
patch: when importing from email, RFC2047-decode From/Subject headers...
r28341
def headdecode(s):
'''Decodes RFC-2047 header'''
uparts = []
Pulkit Goyal
mail: handle renamed email.Header...
r30072 for part, charset in email.header.decode_header(s):
Julien Cristau
patch: when importing from email, RFC2047-decode From/Subject headers...
r28341 if charset is not None:
try:
uparts.append(part.decode(charset))
continue
except UnicodeDecodeError:
pass
try:
uparts.append(part.decode('UTF-8'))
continue
except UnicodeDecodeError:
pass
uparts.append(part.decode('ISO-8859-1'))
Yuya Nishihara
encoding: factor out unicode variants of from/tolocal()...
r31447 return encoding.unitolocal(u' '.join(uparts))