This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8089

py3: __repr__ needs to return str, not bytes
ClosedPublic

Authored by spectral on Feb 6 2020, 1:24 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHGc443b9ba6f63: py3: __repr__ needs to return str, not bytes

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

spectral created this revision.Feb 6 2020, 1:24 PM
marmoute accepted this revision.Feb 6 2020, 2:46 PM
marmoute added a subscriber: marmoute.

looks good.

mharbison72 added a subscriber: mharbison72.Feb 6 2020, 3:34 PM
mharbison72 added inline comments.
mercurial/bundle2.py
1018

Aren't self.__class__.__module__ and self.__class__.__name__ str?

spectral added a commit: rHGc443b9ba6f63: py3: __repr__ needs to return str, not bytes.Feb 6 2020, 5:19 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGc443b9ba6f63: py3: __repr__ needs to return str, not bytes (authored by spectral). · Explain Why
This revision was automatically updated to reflect the committed changes.
spectral added inline comments.Feb 6 2020, 6:56 PM
mercurial/bundle2.py
1018

Yep, so this instance fails for other reasons as well. Sigh. I've sent a followup (D8091). This may cause output like <foo object at 0xabcd1234; id: b'id'; type: b'type'; mandatory: True>.

I didn't actually test most of these, obviously :P I just did a grep for repr returning bytes...

Revision Contents
Changeset List

PathPackages
Mmercurial/bundle2.py (1 line)
Mmercurial/linelog.py (2 lines)
Mmercurial/manifest.py (4 lines)
Mmercurial/patch.py (1 line)

Diff 19969

mercurial/bundle2.py

self._seenparams.add(pname) self._seenparams.add(pname)
# status of the part's generation: # status of the part's generation:
# - None: not started, # - None: not started,
# - False: currently generated, # - False: currently generated,
# - True: generation done. # - True: generation done.
self._generated = None self._generated = None
self.mandatory = mandatory self.mandatory = mandatory
@encoding.strmethod
def __repr__(self): def __repr__(self):
cls = b"%s.%s" % (self.__class__.__module__, self.__class__.__name__) cls = b"%s.%s" % (self.__class__.__module__, self.__class__.__name__)
mharbison72Unsubmitted
Not Done

Aren't self.__class__.__module__ and self.__class__.__name__ str?

mharbison72: Aren't `self.__class__.__module__` and `self.__class__.__name__` str?
spectralAuthorUnsubmitted
Done

Yep, so this instance fails for other reasons as well. Sigh. I've sent a followup (D8091). This may cause output like <foo object at 0xabcd1234; id: b'id'; type: b'type'; mandatory: True>.

I didn't actually test most of these, obviously :P I just did a grep for repr returning bytes...

spectral: Yep, so this instance fails for other reasons as well. Sigh. I've sent a followup (D8091).
return b'<%s object at %x; id: %s; type: %s; mandatory: %s>' % ( return b'<%s object at %x; id: %s; type: %s; mandatory: %s>' % (
cls, cls,
id(self), id(self),
self.id, self.id,
self.type, self.type,
self.mandatory, self.mandatory,
) )

mercurial/linelog.py

def __eq__(self, other): def __eq__(self, other):
return ( return (
type(self) == type(other) type(self) == type(other)
and self._program == other._program and self._program == other._program
and self._maxrev == other._maxrev and self._maxrev == other._maxrev
) )
def __repr__(self): def __repr__(self):
return b'<linelog at %s: maxrev=%d size=%d>' % ( return '<linelog at %s: maxrev=%d size=%d>' % (
hex(id(self)), hex(id(self)),
self._maxrev, self._maxrev,
len(self._program), len(self._program),
) )
def debugstr(self): def debugstr(self):
fmt = '%%%dd %%s' % len(str(len(self._program))) fmt = '%%%dd %%s' % len(str(len(self._program)))
return pycompat.sysstr(b'\n').join( return pycompat.sysstr(b'\n').join(

mercurial/manifest.py

from .node import ( from .node import (
bin, bin,
hex, hex,
nullid, nullid,
nullrev, nullrev,
) )
from .pycompat import getattr from .pycompat import getattr
from . import ( from . import (
encoding,
error, error,
mdiff, mdiff,
pathutil, pathutil,
policy, policy,
pycompat, pycompat,
revlog, revlog,
util, util,
) )
# See if we can skip loading everything. # See if we can skip loading everything.
if self._files or ( if self._files or (
self._dirs and any(not m._isempty() for m in self._dirs.values()) self._dirs and any(not m._isempty() for m in self._dirs.values())
): ):
return False return False
self._loadalllazy() self._loadalllazy()
return not self._dirs or all(m._isempty() for m in self._dirs.values()) return not self._dirs or all(m._isempty() for m in self._dirs.values())
@encoding.strmethod
def __repr__(self): def __repr__(self):
return ( return (
b'<treemanifest dir=%s, node=%s, loaded=%s, dirty=%s at 0x%x>' b'<treemanifest dir=%s, node=%s, loaded=%r, dirty=%r at 0x%x>'
% ( % (
self._dir, self._dir,
hex(self._node), hex(self._node),
bool(self._loadfunc is _noop), bool(self._loadfunc is _noop),
self._dirty, self._dirty,
id(self), id(self),
) )
) )

mercurial/patch.py

) )
fp.write(b''.join(self.before + self.hunk + self.after)) fp.write(b''.join(self.before + self.hunk + self.after))
pretty = write pretty = write
def filename(self): def filename(self):
return self.header.filename() return self.header.filename()
@encoding.strmethod
def __repr__(self): def __repr__(self):
return b'<hunk %r@%d>' % (self.filename(), self.fromline) return b'<hunk %r@%d>' % (self.filename(), self.fromline)
def getmessages(): def getmessages():
return { return {
b'multiple': { b'multiple': {
b'apply': _(b"apply change %d/%d to '%s'?"), b'apply': _(b"apply change %d/%d to '%s'?"),