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

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Sat Jun 9 22:20:26 EDT 2018


This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb4269bbbefbc: py3: make sure util.username() always returns bytes (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3706?vs=9003&id=9005

REVISION DETAIL
  https://phab.mercurial-scm.org/D3706

AFFECTED FILES
  mercurial/posix.py

CHANGE DETAILS

diff --git a/mercurial/posix.py b/mercurial/posix.py
--- a/mercurial/posix.py
+++ b/mercurial/posix.py
@@ -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)
 
 def groupname(gid=None):
     """Return the name of the group with the given gid.



To: pulkit, #hg-reviewers
Cc: yuja, mercurial-devel


More information about the Mercurial-devel mailing list