This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5713

notify: be more defensive aboute None values
ClosedPublic

Authored by indygreg on Jan 26 2019, 2:43 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG43f9b8c0574b: notify: be more defensive aboute None values
Summary

encoding.strtolocal is the identity function on Python 2
but an actual string manipulation routine on Python 3.

In some cases, we were passing None, which caused Python 3
to barf.

Let's change the code to react properly when the value is
None.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Jan 26 2019, 2:43 PM
pulkit accepted this revision.Jan 26 2019, 4:32 PM
Closed by commit rHG43f9b8c0574b: notify: be more defensive aboute None values (authored by indygreg). · Explain WhyJan 26 2019, 4:53 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/notify.py (8 lines)

Diff 13513

hgext/notify.py

p = emailparser.Parser() p = emailparser.Parser()
try: try:
msg = p.parsestr(encoding.strfromlocal(data)) msg = p.parsestr(encoding.strfromlocal(data))
except emailerrors.MessageParseError as inst: except emailerrors.MessageParseError as inst:
raise error.Abort(inst) raise error.Abort(inst)
# store sender and subject # store sender and subject
sender = encoding.strtolocal(msg[r'From']) sender = msg[r'From']
subject = encoding.strtolocal(msg[r'Subject']) subject = msg[r'Subject']
if sender is not None:
sender = encoding.strtolocal(sender)
if subject is not None:
subject = encoding.strtolocal(subject)
del msg[r'From'], msg[r'Subject'] del msg[r'From'], msg[r'Subject']
if not msg.is_multipart(): if not msg.is_multipart():
# create fresh mime message from scratch # create fresh mime message from scratch
# (multipart templates must take care of this themselves) # (multipart templates must take care of this themselves)
headers = msg.items() headers = msg.items()
payload = msg.get_payload() payload = msg.get_payload()
# for notification prefer readability over data precision # for notification prefer readability over data precision