Changeset fb4d788 in mainline for contrib/bazaar/bzreml/__init__.py


Ignore:
Timestamp:
2015-07-28T11:28:14Z (10 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6accc5cf
Parents:
df2bce32 (diff), 47726b5e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge from the mainline

File:
1 edited

Legend:

Unmodified
Added
Removed

  • contrib/bazaar/bzreml/__init__.py

    rdf2bce32 rfb4d788  
    7070       
    7171        sender_user, sender_email = parseaddr(sender)
    72         payload = MIMEText(body.encode("utf-8"), "plain", "utf-8")
     72        payload = MIMEText(body.decode("utf-8", 'ignore').encode("utf-8", 'ignore'), "plain", "utf-8")
    7373       
    7474        msg = MIMEMultipart()
Note: See TracChangeset for help on using the changeset viewer.