This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1555

py3: use bytes in place of basestring
ClosedPublic

Authored by pulkit on Nov 29 2017, 6:09 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGbfd072c52e03: py3: use bytes in place of basestring
rHG2523ab8ba69d: py3: use bytes in place of basestring
Summary

All strings in mercurial must be bytes so we can easily replace basestring with
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

pulkit created this revision.Nov 29 2017, 6:09 PM
yuja requested changes to this revision.Nov 30 2017, 7:16 AM
yuja added a subscriber: yuja.

Testing a unicode string is probably wrong since almost all "strings" in Mercurial
must be bytes. Perhaps these basestrings can be replaced with bytes.

This revision now requires changes to proceed.Nov 30 2017, 7:16 AM
pulkit edited the summary of this revision. (Show Details)Dec 1 2017, 9:13 AM
pulkit retitled this revision from py3: add pycompat.basestring and use it to py3: use bytes in place of basestring.
pulkit updated this revision to Diff 4048.
yuja accepted this revision.Dec 1 2017, 9:56 PM
This revision is now accepted and ready to land.Dec 1 2017, 9:56 PM
Closed by commit rHG2523ab8ba69d: py3: use bytes in place of basestring (authored by pulkit). · Explain WhyDec 1 2017, 10:11 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/convert/convcmd.py (2 lines)
Mmercurial/cmdutil.py (2 lines)
Mmercurial/httppeer.py (2 lines)

Diff 4081

hgext/convert/convcmd.py

commit.branch = mapbranch(commit.branch, self.branchmap) commit.branch = mapbranch(commit.branch, self.branchmap)
self.commitcache[rev] = commit self.commitcache[rev] = commit
return commit return commit
def copy(self, rev): def copy(self, rev):
commit = self.commitcache[rev] commit = self.commitcache[rev]
full = self.opts.get('full') full = self.opts.get('full')
changes = self.source.getchanges(rev, full) changes = self.source.getchanges(rev, full)
if isinstance(changes, basestring): if isinstance(changes, bytes):
if changes == SKIPREV: if changes == SKIPREV:
dest = SKIPREV dest = SKIPREV
else: else:
dest = self.map[changes] dest = self.map[changes]
self.map[rev] = dest self.map[rev] = dest
return return
files, copies, cleanp2 = changes files, copies, cleanp2 = changes
pbranches = [] pbranches = []

mercurial/cmdutil.py

ui.note(_('saving current version of %s as %s\n') % ui.note(_('saving current version of %s as %s\n') %
(rel, bakname)) (rel, bakname))
if not opts.get('dry_run'): if not opts.get('dry_run'):
if interactive: if interactive:
util.copyfile(target, bakname) util.copyfile(target, bakname)
else: else:
util.rename(target, bakname) util.rename(target, bakname)
if ui.verbose or not exact: if ui.verbose or not exact:
if not isinstance(msg, basestring): if not isinstance(msg, bytes):
msg = msg(abs) msg = msg(abs)
ui.status(msg % rel) ui.status(msg % rel)
elif exact: elif exact:
ui.warn(msg % rel) ui.warn(msg % rel)
break break
if not opts.get('dry_run'): if not opts.get('dry_run'):
needdata = ('revert', 'add', 'undelete') needdata = ('revert', 'add', 'undelete')

mercurial/httppeer.py

# with infinite recursion when trying to look up capabilities # with infinite recursion when trying to look up capabilities
# for the first time. # for the first time.
postargsok = self._caps is not None and 'httppostargs' in self._caps postargsok = self._caps is not None and 'httppostargs' in self._caps
if postargsok and args: if postargsok and args:
strargs = urlreq.urlencode(sorted(args.items())) strargs = urlreq.urlencode(sorted(args.items()))
if not data: if not data:
data = strargs data = strargs
else: else:
if isinstance(data, basestring): if isinstance(data, bytes):
i = io.BytesIO(data) i = io.BytesIO(data)
i.length = len(data) i.length = len(data)
data = i data = i
argsio = io.BytesIO(strargs) argsio = io.BytesIO(strargs)
argsio.length = len(strargs) argsio.length = len(strargs)
data = _multifile(argsio, data) data = _multifile(argsio, data)
headers[r'X-HgArgs-Post'] = len(strargs) headers[r'X-HgArgs-Post'] = len(strargs)
else: else: