pwdgrp: add C helpers to get user/group bytes directly

[bup.git] / lib / bup / pwdgrp.py

diff --git a/lib/bup/pwdgrp.py b/lib/bup/pwdgrp.py
index 4374bea8a0b62ead8272886348b49c3e81bbb32e..a5b6d8b0876bc4a68784bf1ecc723d3d41cb959c 100644 (file)
--- a/lib/bup/pwdgrp.py
+++ b/lib/bup/pwdgrp.py
@@ -2,8 +2,7 @@
 from __future__ import absolute_import, print_function
 import os, pwd, grp
 
-from bup import compat  # to force the LC_CTYPE check
-from bup.compat import py_maj
+from bup import _helpers
 from bup.helpers import cache_key_value
 
 
@@ -23,23 +22,14 @@ class Passwd:
          self.pw_gecos, self.pw_dir, self.pw_shell) = \
              name, passwd, uid, gid, gecos, dir, shell
 
-def _passwd_from_py(py):
-    if py_maj < 3:
-        return py
-    return Passwd(py.pw_name.encode('iso-8859-1'),
-                  py.pw_passwd.encode("iso-8859-1"),
-                  py.pw_uid, py.pw_gid,
-                  py.pw_gecos.encode('iso-8859-1'),
-                  py.pw_dir.encode('iso-8859-1'),
-                  py.pw_shell.encode('iso-8859-1'))
-
 def getpwuid(uid):
-    return _passwd_from_py(pwd.getpwuid(uid))
+    r = _helpers.getpwuid(uid)
+    return Passwd(*r) if r else None
 
 def getpwnam(name):
     assert isinstance(name, bytes)
-    return _passwd_from_py(pwd.getpwnam(name.decode('iso-8859-1') if py_maj > 2
-                                        else name))
+    r = _helpers.getpwnam(name)
+    return Passwd(*r) if r else None
 
 
 class Group:
@@ -53,21 +43,14 @@ class Group:
         self.gr_name, self.gr_passwd, self.gr_gid, self.gr_mem = \
             name, passwd, gid, mem
 
-def _group_from_py(py):
-    if py_maj < 3:
-        return py
-    return Group(py.gr_name.encode('iso-8859-1'),
-                 py.gr_passwd.encode('iso-8859-1'),
-                 py.gr_gid,
-                 tuple(x.encode('iso-8859-1') for x in py.gr_mem))
-
 def getgrgid(uid):
-    return _group_from_py(grp.getgrgid(uid))
+    r = _helpers.getgrgid(uid)
+    return Group(*r) if r else None
 
 def getgrnam(name):
     assert isinstance(name, bytes)
-    return _group_from_py(grp.getgrnam(name.decode('iso-8859-1') if py_maj > 2
-                                       else name))
+    r = _helpers.getgrnam(name)
+    return Group(*r) if r else None
 
 
 _uid_to_pwd_cache = {}