> @@ -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' %`.