This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3706

py3: make sure util.username() always returns bytes
ClosedPublic

Authored by pulkit on Jun 9 2018, 1:37 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa4aa77b84efd: py3: make sure util.username() always returns bytes
rHGb4269bbbefbc: py3: make sure util.username() always returns bytes
Summary

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.Jun 9 2018, 1:37 PM
yuja added a subscriber: yuja.Jun 9 2018, 10:18 PM

@@ -541,9 +541,9 @@

if uid is None:
    uid = os.getuid()
try:
  • return pwd.getpwuid(uid)[0]

+ return pycompat.fsencode(pwd.getpwuid(uid)[0])

except KeyError:
  • return str(uid)

+ return pycompat.bytestr(uid)

Nit: could be b'%d' %.

Closed by commit rHGb4269bbbefbc: py3: make sure util.username() always returns bytes (authored by pulkit). · Explain WhyJun 9 2018, 10:20 PM
This revision was automatically updated to reflect the committed changes.
pulkit added a comment.Jun 10 2018, 3:15 AM
In D3706#58203, @yuja wrote:

@@ -541,9 +541,9 @@

if uid is None:
    uid = os.getuid()
try:
  • return pwd.getpwuid(uid)[0]

+ return pycompat.fsencode(pwd.getpwuid(uid)[0])

except KeyError:
  • return str(uid)

+ return pycompat.bytestr(uid)

Nit: could be b'%d' %.

I was afraid that someone can pass uid as a str or bytes. I will followup with the suggestion.

Revision Contents
Changeset List

PathPackages
Mmercurial/posix.py (4 lines)

Diff 9005

mercurial/posix.py

def username(uid=None): def username(uid=None):
"""Return the name of the user with the given uid. """Return the name of the user with the given uid.
If uid is None, return the name of the current user.""" If uid is None, return the name of the current user."""
if uid is None: if uid is None:
uid = os.getuid() uid = os.getuid()
try: try:
return pwd.getpwuid(uid)[0] return pycompat.fsencode(pwd.getpwuid(uid)[0])
except KeyError: except KeyError:
return str(uid) return pycompat.bytestr(uid)
def groupname(gid=None): def groupname(gid=None):
"""Return the name of the group with the given gid. """Return the name of the group with the given gid.
If gid is None, return the name of the current group.""" If gid is None, return the name of the current group."""
if gid is None: if gid is None:
gid = os.getgid() gid = os.getgid()