This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5794

py3: pass str into grp.getgrnam
ClosedPublic

Authored by pulkit on Feb 1 2019, 6:31 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG587a3c976892: py3: pass str into grp.getgrnam
rHG753a43c43742: py3: pass str into grp.getgrnam
rHGe011c78da629: py3: pass str into grp.getgrnam
Summary

grp.getgrnam expects str on Python 3.

This fixes test-acl.t on Python 3.

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.Feb 1 2019, 6:31 PM
Closed by commit rHGe011c78da629: py3: pass str into grp.getgrnam (authored by pulkit). · Explain WhyFeb 1 2019, 7:51 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Feb 1 2019, 8:50 PM

+ name = pycompat.sysstr(name)

return list(grp.getgrnam(name).gr_mem)

Perhaps, it should be fsdecode() since they appear to abuse
PyUnicode_EncodeFSDefault() to get back bytes.

And we'll probably need to fsencode() gr_mem back to bytes as well.

indygreg added a subscriber: indygreg.Feb 1 2019, 9:06 PM
In D5794#85031, @yuja wrote:

Perhaps, it should be fsdecode() since they appear to abuse
PyUnicode_EncodeFSDefault() to get back bytes.
And we'll probably need to fsencode() gr_mem back to bytes as well.

Ugh, Python. And the raw system call accepts a char *. So this whole "pretend to be Unicode" is just plain silly.

Revision Contents
Changeset List

PathPackages
Mcontrib/python3-whitelist (1 line)
Mmercurial/posix.py (1 line)

Diff 13683

contrib/python3-whitelist

test-abort-checkin.t test-abort-checkin.t
test-absorb-edit-lines.t test-absorb-edit-lines.t
test-absorb-filefixupstate.py test-absorb-filefixupstate.py
test-absorb-phase.t test-absorb-phase.t
test-absorb-rename.t test-absorb-rename.t
test-absorb-strip.t test-absorb-strip.t
test-absorb.t test-absorb.t
test-acl.t
test-add.t test-add.t
test-addremove-similar.t test-addremove-similar.t
test-addremove.t test-addremove.t
test-alias.t test-alias.t
test-amend-subrepo.t test-amend-subrepo.t
test-amend.t test-amend.t
test-ancestor.py test-ancestor.py
test-annotate.py test-annotate.py

mercurial/posix.py

return grp.getgrgid(gid)[0] return grp.getgrgid(gid)[0]
except KeyError: except KeyError:
return str(gid) return str(gid)
def groupmembers(name): def groupmembers(name):
"""Return the list of members of the group with the given """Return the list of members of the group with the given
name, KeyError if the group does not exist. name, KeyError if the group does not exist.
""" """
name = pycompat.sysstr(name)
return list(grp.getgrnam(name).gr_mem) return list(grp.getgrnam(name).gr_mem)
def spawndetached(args): def spawndetached(args):
return os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0), return os.spawnvp(os.P_NOWAIT | getattr(os, 'P_DETACH', 0),
args[0], args) args[0], args)
def gethgcmd(): def gethgcmd():
return sys.argv[:1] return sys.argv[:1]