From: Rob Browning Date: Sun, 20 Oct 2019 17:46:37 +0000 (-0500) Subject: username/userfullname: use struct names X-Git-Tag: 0.31~248 X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=bup.git;a=commitdiff_plain;h=88b26b6847ed42ee1c8108ed91dc5c151705044a username/userfullname: use struct names Use the pwd names, not indexes. That's clearer and it'll support upcoming py3 compatibility work. While we're at it, start making it clear these are binary (bytes). Signed-off-by: Rob Browning Tested-by: Rob Browning --- diff --git a/lib/bup/helpers.py b/lib/bup/helpers.py index 333a491..d66b5f1 100644 --- a/lib/bup/helpers.py +++ b/lib/bup/helpers.py @@ -442,7 +442,7 @@ def username(): global _username if not _username: uid = os.getuid() - _username = pwd_from_uid(uid)[0] or 'user%d' % uid + _username = pwd_from_uid(uid).pw_name or b'user%d' % uid return _username @@ -454,9 +454,9 @@ def userfullname(): uid = os.getuid() entry = pwd_from_uid(uid) if entry: - _userfullname = entry[4].split(',')[0] or entry[0] + _userfullname = entry.pw_gecos.split(b',')[0] or entry.pw_name if not _userfullname: - _userfullname = 'user%d' % uid + _userfullname = b'user%d' % uid return _userfullname