This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3127

py3: return bytes from util.removeauth()
ClosedPublic

Authored by pulkit on Apr 5 2018, 8:31 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb23e3cc1afd4: py3: return bytes from util.removeauth()
Summary

util.hidepassword() also returns bytes and we should deal in bytes as much as
possible.

This makes test-logexchange.t pass on Python 3.5

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Apr 5 2018, 8:31 AM
Closed by commit rHGb23e3cc1afd4: py3: return bytes from util.removeauth() (authored by pulkit). · Explain WhyApr 5 2018, 9:48 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (2 lines)

Diff 7710

mercurial/util.py

if u.passwd: if u.passwd:
u.passwd = '***' u.passwd = '***'
return bytes(u) return bytes(u)
def removeauth(u): def removeauth(u):
'''remove all authentication information from a url string''' '''remove all authentication information from a url string'''
u = url(u) u = url(u)
u.user = u.passwd = None u.user = u.passwd = None
return str(u) return bytes(u)
timecount = unitcountfn( timecount = unitcountfn(
(1, 1e3, _('%.0f s')), (1, 1e3, _('%.0f s')),
(100, 1, _('%.1f s')), (100, 1, _('%.1f s')),
(10, 1, _('%.2f s')), (10, 1, _('%.2f s')),
(1, 1, _('%.3f s')), (1, 1, _('%.3f s')),
(100, 0.001, _('%.1f ms')), (100, 0.001, _('%.1f ms')),
(10, 0.001, _('%.2f ms')), (10, 0.001, _('%.2f ms')),