alter parameter; zone name instead of session

Author: d-w-moore

README.md

@@ -2157,7 +2157,7 @@ acls = [
 ]
 
 session = irods.helpers.make_session()
-normalize = lambda acl: acl.normal(session)
+normalize = lambda acl: acl.normal(local_zone=session.zone)
 
 print(normalize(acls[0]) == normalize(acls[2]))
 acls.sort(key=normalize)

irods/access.py

@@ -119,8 +119,20 @@ def __eq__(self, other):
     def __hash__(self):
         return hash((self.access_name, str(self.path), self.user_name, self.user_zone))
 
-    def normal(self, session=None):
-        normal_form = self.copy(decanonicalize=-1, implied_zone=(session.zone if session else ''))
+    def normal(self, local_zone=""):
+        """
+        Create a normalized version of the object for comparison in sorting or determining equavalence.
+
+        Args:
+            local_zone: the name of the home zone, if any, in which client user directly authenticates.
+                The purpose is zone name normalization; if this parameter is a nonzero-length string which
+                matches the zone_name in the source object, the copy will contain a null zone_name field.
+
+        Returns:
+            The normalized copy of the source object.  In practice, this will be an ACLOperation or iRODSAccess
+            object, according to the type of the source object.
+        """
+        normal_form = self.copy(decanonicalize=-1, implied_zone=local_zone)
         normal_form.path = ""
         return normal_form
 

irods/test/access_test.py

@@ -514,13 +514,13 @@ def test_atomic_acls__issue_505(self):
                 a4 := ACLOperation("read", group.name),
             )
 
-            accesses = {acl.normal(ses) for acl in ses.acls.get(self.coll)}
+            accesses = {acl.normal(ses.zone) for acl in ses.acls.get(self.coll)}
 
             # Assert that the ACLs we added are among those listed for the object in the catalog.
-            self.assertIn(a1.normal(ses), accesses)
-            self.assertIn(a2.normal(ses), accesses)
-            self.assertIn(a3.normal(ses), accesses)
-            self.assertIn(a4.normal(ses), accesses)
+            self.assertIn(a1.normal(ses.zone), accesses)
+            self.assertIn(a2.normal(ses.zone), accesses)
+            self.assertIn(a3.normal(ses.zone), accesses)
+            self.assertIn(a4.normal(ses.zone), accesses)
 
         finally:
             if user1: