This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2042

py3: add __bytes__() for mq.patchheader and make sure __str__ returns str
ClosedPublic

Authored by pulkit on Feb 5 2018, 3:23 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGd41e41d11574: py3: add __bytes__() for mq.patchheader and make sure __str__ returns str
Summary

Before this patch, str() function for mq.patchheader class return bytes
which is not str on Python 3. So let's move that logic to bytes() and for
str() convert the return value of bytes() to str.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Feb 5 2018, 3:23 AM
yuja accepted this revision.Feb 5 2018, 9:07 AM
This revision is now accepted and ready to land.Feb 5 2018, 9:07 AM
Closed by commit rHGd41e41d11574: py3: add __bytes__() for mq.patchheader and make sure __str__ returns str (authored by pulkit). · Explain WhyFeb 5 2018, 9:26 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/mq.py (4 lines)

Diff 5200

hgext/mq.py

if self.comments: if self.comments:
self._delmsg() self._delmsg()
self.message = [message] self.message = [message]
if message: if message:
if self.plainmode and self.comments and self.comments[-1]: if self.plainmode and self.comments and self.comments[-1]:
self.comments.append('') self.comments.append('')
self.comments.append(message) self.comments.append(message)
def __str__(self): def __bytes__(self):
s = '\n'.join(self.comments).rstrip() s = '\n'.join(self.comments).rstrip()
if not s: if not s:
return '' return ''
return s + '\n\n' return s + '\n\n'
__str__ = encoding.strmethod(__bytes__)
def _delmsg(self): def _delmsg(self):
'''Remove existing message, keeping the rest of the comments fields. '''Remove existing message, keeping the rest of the comments fields.
If comments contains 'subject: ', message will prepend If comments contains 'subject: ', message will prepend
the field and a blank line.''' the field and a blank line.'''
if self.message: if self.message:
subj = 'subject: ' + self.message[0].lower() subj = 'subject: ' + self.message[0].lower()
for i in xrange(len(self.comments)): for i in xrange(len(self.comments)):
if subj == self.comments[i].lower(): if subj == self.comments[i].lower():