rename normal->normalize

Author: d-w-moore

README.md

@@ -2157,11 +2157,11 @@ acls = [
 ]
 
 session = irods.helpers.make_session()
-normalize = lambda acl: acl.normal(local_zone=session.zone)
+N = lambda acl: acl.normalize(local_zone=session.zone)
 
-print(normalize(acls[0]) == normalize(acls[2]))
-acls.sort(key=normalize)
-print(normalize(iRODSAccess('read', '', 'bob')) in map(normalize,acls))
+print(N(acls[0]) == N(acls[2]))
+acls.sort(key=N)
+print( N(iRODSAccess('read', '', 'bob')) in map(N, acls) )
 ```
 
 If strict order of permissions is desired, we can use code such as the following:
@@ -2174,7 +2174,7 @@ pp(sorted(
         ACLOperation('own', 'rods'),
         ACLOperation('read_object', 'alice')
     ],
-    key=lambda acl: (all_permissions[acl.access_name], acl.normal())
+    key=lambda acl: (all_permissions[acl.access_name], acl.normalize())
 ))
 ```
 

irods/access.py

@@ -119,7 +119,7 @@ def __eq__(self, other):
     def __hash__(self):
         return hash((self.access_name, str(self.path), self.user_name, self.user_zone))
 
-    def normal(self, local_zone=""):
+    def normalize(self, local_zone=""):
         """
         Create a normalized version of the object for comparison in sorting or determining equivalence.
 
@@ -132,9 +132,9 @@ def normal(self, local_zone=""):
             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
+        normalized_form = self.copy(decanonicalize=-1, implied_zone=local_zone)
+        normalized_form.path = ""
+        return normalized_form
 
     def copy(self, decanonicalize=False, implied_zone=''):
         """

irods/test/access_test.py

@@ -514,13 +514,11 @@ def test_atomic_acls__issue_505(self):
                 a4 := ACLOperation("read", group.name),
             )
 
-            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.zone), accesses)
-            self.assertIn(a2.normal(ses.zone), accesses)
-            self.assertIn(a3.normal(ses.zone), accesses)
-            self.assertIn(a4.normal(ses.zone), accesses)
+            # Assert that the ACLs we added are now a subset of those now listed in the catalog.
+            self.assertLessEqual(
+                {acl.normalize(ses.zone) for acl in (a1,a2,a3,a4)},
+                {acl.normalize(ses.zone) for acl in ses.acls.get(self.coll)}
+            )
 
         finally:
             if user1: