Correct the tests for afs.acl to match a function rename.

[invirt/packages/python-afs.git] / afs / _pts.pyx

diff --git a/afs/_pts.pyx b/afs/_pts.pyx
index c18ef0f..4a40bd0 100644 (file)
--- a/afs/_pts.pyx
+++ b/afs/_pts.pyx
@@ -134,6 +134,7 @@ cdef class PTS:
         server
     """
     cdef ubik_client * client
         server
     """
     cdef ubik_client * client

+    cdef readonly object cell

 
     def __cinit__(self, cell=None, sec=1):
         cdef afs_int32 code
 
     def __cinit__(self, cell=None, sec=1):
         cdef afs_int32 code

@@ -167,6 +168,8 @@ cdef class PTS:
         code = afsconf_GetCellInfo(cdir, c_cell, "afsprot", &info)
         pyafs_error(code)
 
         code = afsconf_GetCellInfo(cdir, c_cell, "afsprot", &info)
         pyafs_error(code)
 

+        self.cell = info.name
+

         if sec > 0:
             strncpy(prin.cell, info.name, sizeof(prin.cell))
             prin.instance[0] = 0
         if sec > 0:
             strncpy(prin.cell, info.name, sizeof(prin.cell))
             prin.instance[0] = 0

@@ -209,24 +212,24 @@ cdef class PTS:
         ubik_ClientDestroy(self.client)
         rx_Finalize()
 
         ubik_ClientDestroy(self.client)
         rx_Finalize()
 

-    def NameOrId(self, ident):
+    def _NameOrId(self, ident):

         """
         Given an identifier, convert it to a PTS ID by looking up the
         name if it's a string, or otherwise just converting it to an
         integer.
         """
         if isinstance(ident, (str, unicode)):
         """
         Given an identifier, convert it to a PTS ID by looking up the
         name if it's a string, or otherwise just converting it to an
         integer.
         """
         if isinstance(ident, (str, unicode)):

-            return self.NameToId(ident)
+            return self._NameToId(ident)

         else:
             return int(ident)
 
         else:
             return int(ident)
 

-    def NameToId(self, name):
+    def _NameToId(self, name):

         """
         Converts a user or group to an AFS ID.
         """
         cdef namelist lnames
         cdef idlist lids
         """
         Converts a user or group to an AFS ID.
         """
         cdef namelist lnames
         cdef idlist lids

-        cdef afs_int32 code, id
+        cdef afs_int32 code, id = ANONYMOUSID

         name = name.lower()
 
         lids.idlist_len = 0
         name = name.lower()
 
         lids.idlist_len = 0

@@ -243,7 +246,7 @@ cdef class PTS:
         pyafs_error(code)
         return id
 
         pyafs_error(code)
         return id
 

-    def IdToName(self, id):
+    def _IdToName(self, id):

         """
         Convert an AFS ID to the name of a user or group.
         """
         """
         Convert an AFS ID to the name of a user or group.
         """

@@ -268,7 +271,7 @@ cdef class PTS:
         pyafs_error(code)
         return name
 
         pyafs_error(code)
         return name
 

-    def CreateUser(self, name, id=None):
+    def _CreateUser(self, name, id=None):

         """
         Create a new user in the protection database. If an ID is
         provided, that one will be used.
         """
         Create a new user in the protection database. If an ID is
         provided, that one will be used.

@@ -288,7 +291,7 @@ cdef class PTS:
         pyafs_error(code)
         return cid
 
         pyafs_error(code)
         return cid
 

-    def CreateGroup(self, name, owner, id=None):
+    def _CreateGroup(self, name, owner, id=None):

         """
         Create a new group in the protection database. If an ID is
         provided, that one will be used.
         """
         Create a new group in the protection database. If an ID is
         provided, that one will be used.

@@ -296,7 +299,7 @@ cdef class PTS:
         cdef afs_int32 code, cid
 
         name = name[:PR_MAXNAMELEN].lower()
         cdef afs_int32 code, cid
 
         name = name[:PR_MAXNAMELEN].lower()

-        oid = self.NameOrId(owner)
+        oid = self._NameOrId(owner)

 
         if id is not None:
             cid = id
 
         if id is not None:
             cid = id

@@ -307,38 +310,38 @@ cdef class PTS:
         pyafs_error(code)
         return cid
 
         pyafs_error(code)
         return cid
 

-    def Delete(self, ident):
+    def _Delete(self, ident):

         """
         Delete the protection database entry with the provided
         identifier.
         """
         cdef afs_int32 code
         """
         Delete the protection database entry with the provided
         identifier.
         """
         cdef afs_int32 code

-        cdef afs_int32 id = self.NameOrId(ident)
+        cdef afs_int32 id = self._NameOrId(ident)

 
         code = ubik_PR_Delete(self.client, 0, id)
         pyafs_error(code)
 
 
         code = ubik_PR_Delete(self.client, 0, id)
         pyafs_error(code)
 

-    def AddToGroup(self, user, group):
+    def _AddToGroup(self, user, group):

         """
         Add the given user to the given group.
         """
         cdef afs_int32 code
         """
         Add the given user to the given group.
         """
         cdef afs_int32 code

-        cdef afs_int32 uid = self.NameOrId(user), gid = self.NameOrId(group)
+        cdef afs_int32 uid = self._NameOrId(user), gid = self._NameOrId(group)

 
         code = ubik_PR_AddToGroup(self.client, 0, uid, gid)
         pyafs_error(code)
 
 
         code = ubik_PR_AddToGroup(self.client, 0, uid, gid)
         pyafs_error(code)
 

-    def RemoveFromGroup(self, user, group):
+    def _RemoveFromGroup(self, user, group):

         """
         Remove the given user from the given group.
         """
         cdef afs_int32 code
         """
         Remove the given user from the given group.
         """
         cdef afs_int32 code

-        cdef afs_int32 uid = self.NameOrId(user), gid = self.NameOrId(group)
+        cdef afs_int32 uid = self._NameOrId(user), gid = self._NameOrId(group)

 
         code = ubik_PR_RemoveFromGroup(self.client, 0, uid, gid)
         pyafs_error(code)
 
 
         code = ubik_PR_RemoveFromGroup(self.client, 0, uid, gid)
         pyafs_error(code)
 

-    def ListMembers(self, ident):
+    def _ListMembers(self, ident):

         """
         Get the membership of an entity.
 
         """
         Get the membership of an entity.
 

@@ -355,7 +358,7 @@ cdef class PTS:
         cdef int i
         cdef object members = []
 
         cdef int i
         cdef object members = []
 

-        cdef afs_int32 id = self.NameOrId(ident)
+        cdef afs_int32 id = self._NameOrId(ident)

 
         alist.prlist_len = 0
         alist.prlist_val = NULL
 
         alist.prlist_len = 0
         alist.prlist_val = NULL

@@ -373,7 +376,7 @@ cdef class PTS:
 
         return members
 
 
         return members
 

-    def ListOwned(self, owner):
+    def _ListOwned(self, owner):

         """
         Get all groups owned by an entity.
         """
         """
         Get all groups owned by an entity.
         """

@@ -382,7 +385,7 @@ cdef class PTS:
         cdef int i
         cdef object owned = []
 
         cdef int i
         cdef object owned = []
 

-        cdef afs_int32 oid = self.NameOrId(owner)
+        cdef afs_int32 oid = self._NameOrId(owner)

 
         alist.prlist_len = 0
         alist.prlist_val = NULL
 
         alist.prlist_len = 0
         alist.prlist_val = NULL

@@ -400,7 +403,7 @@ cdef class PTS:
 
         return owned
 
 
         return owned
 

-    def ListEntry(self, ident):
+    def _ListEntry(self, ident):

         """
         Load a PTEntry instance with information about the provided
         entity.
         """
         Load a PTEntry instance with information about the provided
         entity.

@@ -409,7 +412,7 @@ cdef class PTS:
         cdef prcheckentry centry
         cdef object entry = PTEntry()
 
         cdef prcheckentry centry
         cdef object entry = PTEntry()
 

-        cdef afs_int32 id = self.NameOrId(ident)
+        cdef afs_int32 id = self._NameOrId(ident)

 
         code = ubik_PR_ListEntry(self.client, 0, id, &centry)
         pyafs_error(code)
 
         code = ubik_PR_ListEntry(self.client, 0, id, &centry)
         pyafs_error(code)

@@ -417,7 +420,7 @@ cdef class PTS:
         _ptentry_from_c(entry, &centry)
         return entry
 
         _ptentry_from_c(entry, &centry)
         return entry
 

-    def ChangeEntry(self, ident, newname=None, newid=None, newoid=None):
+    def _ChangeEntry(self, ident, newname=None, newid=None, newoid=None):

         """
         Change the name, ID, and/or owner of a PTS entity.
 
         """
         Change the name, ID, and/or owner of a PTS entity.
 

@@ -428,10 +431,10 @@ cdef class PTS:
         cdef afs_int32 c_newid = 0, c_newoid = 0
         cdef char * c_newname
 
         cdef afs_int32 c_newid = 0, c_newoid = 0
         cdef char * c_newname
 

-        cdef afs_int32 id = self.NameOrId(ident)
+        cdef afs_int32 id = self._NameOrId(ident)

 
         if newname is None:
 
         if newname is None:

-            newname = self.IdToName(id)
+            newname = self._IdToName(id)

         c_newname = newname
         if newid is not None:
             c_newid = newid
         c_newname = newname
         if newid is not None:
             c_newid = newid

@@ -441,21 +444,21 @@ cdef class PTS:
         code = ubik_PR_ChangeEntry(self.client, 0, id, c_newname, c_newoid, c_newid)
         pyafs_error(code)
 
         code = ubik_PR_ChangeEntry(self.client, 0, id, c_newname, c_newoid, c_newid)
         pyafs_error(code)
 

-    def IsAMemberOf(self, user, group):
+    def _IsAMemberOf(self, user, group):

         """
         Return True if the given user is a member of the given group.
         """
         cdef afs_int32 code
         cdef afs_int32 flag
 
         """
         Return True if the given user is a member of the given group.
         """
         cdef afs_int32 code
         cdef afs_int32 flag
 

-        cdef afs_int32 uid = self.NameOrId(user), gid = self.NameOrId(group)
+        cdef afs_int32 uid = self._NameOrId(user), gid = self._NameOrId(group)

 
         code = ubik_PR_IsAMemberOf(self.client, 0, uid, gid, &flag)
         pyafs_error(code)
 
         return bool(flag)
 
 
         code = ubik_PR_IsAMemberOf(self.client, 0, uid, gid, &flag)
         pyafs_error(code)
 
         return bool(flag)
 

-    def ListMax(self):
+    def _ListMax(self):

         """
         Return a tuple of the maximum user ID and the maximum group
         ID currently assigned.
         """
         Return a tuple of the maximum user ID and the maximum group
         ID currently assigned.

@@ -467,7 +470,7 @@ cdef class PTS:
 
         return (uid, gid)
 
 
         return (uid, gid)
 

-    def SetMaxUserId(self, id):
+    def _SetMaxUserId(self, id):

         """
         Set the maximum currently assigned user ID (the next
         automatically assigned UID will be id + 1)
         """
         Set the maximum currently assigned user ID (the next
         automatically assigned UID will be id + 1)

@@ -477,7 +480,7 @@ cdef class PTS:
         code = ubik_PR_SetMax(self.client, 0, id, 0)
         pyafs_error(code)
 
         code = ubik_PR_SetMax(self.client, 0, id, 0)
         pyafs_error(code)
 

-    def SetMaxGroupId(self, id):
+    def _SetMaxGroupId(self, id):

         """
         Set the maximum currently assigned user ID (the next
         automatically assigned UID will be id + 1)
         """
         Set the maximum currently assigned user ID (the next
         automatically assigned UID will be id + 1)

@@ -487,7 +490,7 @@ cdef class PTS:
         code = ubik_PR_SetMax(self.client, 0, id, PRGRP)
         pyafs_error(code)
 
         code = ubik_PR_SetMax(self.client, 0, id, PRGRP)
         pyafs_error(code)
 

-    def ListEntries(self, users=None, groups=None):
+    def _ListEntries(self, users=None, groups=None):

         """
         Return a list of PTEntry instances representing all entries in
         the PRDB.
         """
         Return a list of PTEntry instances representing all entries in
         the PRDB.

@@ -525,7 +528,7 @@ cdef class PTS:
 
         return entries
 
 
         return entries
 

-    def SetFields(self, ident, access=None, groups=None, users=None):
+    def _SetFields(self, ident, access=None, groups=None, users=None):

         """
         Update the fields for an entry.
 
         """
         Update the fields for an entry.
 

@@ -537,7 +540,7 @@ cdef class PTS:
         cdef afs_int32 code
         cdef afs_int32 mask = 0, flags = 0, nusers = 0, ngroups = 0
 
         cdef afs_int32 code
         cdef afs_int32 mask = 0, flags = 0, nusers = 0, ngroups = 0
 

-        cdef afs_int32 id = self.NameOrId(ident)
+        cdef afs_int32 id = self._NameOrId(ident)

 
         if access is not None:
             flags = access
 
         if access is not None:
             flags = access