squashing together all non-recent, no-longer-controversial ;) corrections

Author: d-w-moore

irods/access.py

@@ -93,10 +93,16 @@ def __init__(self, access_name, path, user_name="", user_zone="", user_type=None
 
     def __lt__(self, other):
         return (
-            self.access_name < other.access_name
-            and self.user_name < other.user_name
-            and self.user_zone < other.user_zone
-        ) and iRODSPath(self.path) < iRODSPath(other.path)
+            self.access_name,
+            self.user_name,
+            self.user_zone,
+            iRODSPath(self.path)
+        ) < (
+            other.access_name,
+            other.user_name,
+            other.user_zone,
+            iRODSPath(other.path)
+        )
 
     def __eq__(self, other):
         return (
@@ -121,7 +127,7 @@ def copy(self, decanonicalize=False, implied_zone=''):
             }.get(self.access_name)
             other.access_name = replacement_string if replacement_string is not None else self.access_name
 
-        # Useful if we wish to force an explicitly specified local zone to null length for equality testing:
+        # Useful if we wish to force an explicitly specified local zone to an implicit zone spec in the copy, for equality testing:
         if '' != implied_zone == other.user_zone:
             other.user_zone = ''
 
@@ -167,9 +173,7 @@ def __lt__(self, other):
         )
 
     def __repr__(self):
-        return f"<ACLOperation: access_name={self.access_name!r} "\
-               f"user_name={self.user_name!r} "\
-               f"user_zone={self.user_zone!r}>"
+        return f"<ACLOperation {self.access_name} {self.user_name} {self.user_zone}>"
 
 class _iRODSAccess_pre_4_3_0(iRODSAccess):
     codes = collections.OrderedDict(

irods/api_number.py

@@ -177,6 +177,7 @@
     "ATOMIC_APPLY_METADATA_OPERATIONS_APN": 20002,
     "GET_FILE_DESCRIPTOR_INFO_APN": 20000,
     "REPLICA_CLOSE_APN": 20004,
+    "ATOMIC_APPLY_ACL_OPERATIONS_APN": 20005,
     "TOUCH_APN": 20007,
     "AUTH_PLUG_REQ_AN": 1201,
     "AUTHENTICATION_APN": 110000,

irods/manager/access_manager.py

@@ -38,7 +38,8 @@ def users_by_ids(session, ids=()):
 
 class AccessManager(Manager):
 
-    def _ACL_operation(self, op_input: iRODSAccess):
+    @staticmethod
+    def _to_acl_operation_json(op_input: iRODSAccess):
         return {
             "acl": op_input.access_name,
             "entity_name": op_input.user_name,
@@ -48,16 +49,18 @@ def _ACL_operation(self, op_input: iRODSAccess):
             )
         }
 
-    def _call_atomic_acl_api(self, logical_path : str, *operations, admin=False):
-        request_text = {"logical_path": logical_path}
-        request_text["admin_mode"] = admin
-        request_text["operations"] = [self._ACL_operation(op) for op in operations]
+    def apply_atomic_operations(self, logical_path : str, *operations, admin=False):
+        request_text = {
+            "logical_path": logical_path,
+            "admin_mode": admin,
+            "operations": [self._to_acl_operation_json(op) for op in operations]
+        }
 
         with self.sess.pool.get_connection() as conn:
             request_msg = iRODSMessage(
                 "RODS_API_REQ",
                 JSON_Message(request_text, conn.server_version),
-                int_info=20005,
+                int_info=api_number["ATOMIC_APPLY_ACL_OPERATIONS_APN"],
             )
             conn.send(request_msg)
             response = conn.recv()

irods/test/access_test.py

@@ -506,7 +506,7 @@ def test_atomic_acls_505(self):
             user2 = ses.users.create("rod_serling_505#twilight", "rodsuser")
             user3 = ses.users.create("local_test_user_505", "rodsuser")
             group = ses.groups.create("test_group_505")
-            ses.acls._call_atomic_acl_api(
+            ses.acls.apply_atomic_operations(
                 self.coll_path,
                 a1:=ACLOperation("write", user1.name, user1.zone),
                 a2:=ACLOperation("read", user2.name, user2.zone),