[#557] de-duplicate acl lists in case of multiple replicas.

Author: d-w-moore

irods/access.py

@@ -1,6 +1,7 @@
 import collections
 import copy
 import six
+from irods.path import iRODSPath
 
 class _Access_LookupMeta(type):
     def __getitem__(self, key): return self.codes[key]
@@ -63,6 +64,18 @@ def __init__(self, access_name, path, user_name='', user_zone='', user_type=None
         self.user_zone = user_zone
         self.user_type = user_type
 
+    def __eq__(self,other):
+        return self.access_name == other.access_name and \
+               iRODSPath(self.path) == iRODSPath(other.path) and \
+               self.user_name == other.user_name and \
+               self.user_zone == other.user_zone
+
+    def __hash__(self):
+        return hash((self.access_name,
+                     iRODSPath(self.path),
+                     self.user_name,
+                     self.user_zone))
+
     def copy(self, decanonicalize = False):
         other = copy.deepcopy(self)
         if decanonicalize:

irods/manager/access_manager.py

@@ -116,12 +116,15 @@ def __get_raw(self, target, **kw):
         elif users_out is None: pass
         else:                   raise TypeError
 
-        acls = [ iRODSAccess ( r[access_column.name],
+        # Instantiate as set before converting to a list, in order to remove duplicate iRODSAccess
+        # objects. [#557]
+
+        acls = list({ iRODSAccess ( r[access_column.name],
                                target.path,
                                user_lookup[r[access_column.user_id]].name,
                                user_lookup[r[access_column.user_id]].zone,
                                user_lookup[r[access_column.user_id]].type,
-                             ) for r in rows ]
+                             ) for r in rows })
         return acls
 
 

irods/test/data_obj_test.py

@@ -130,6 +130,19 @@ def create_resc_hierarchy (self, Root, Leaf = None):
             self.sess.resources.remove(Leaf)
             self.sess.resources.remove(Root)
 
+    def test_acls_are_uniquely_listed_for_replicated_data_objects__issue_557(self):
+        with self.create_simple_resc() as newResc1:
+            d = None
+            try:
+                path = self.coll_path + "/" + unique_name(my_function_name(), datetime.now())
+                d = self.sess.data_objects.create(path)
+                acls_pre = self.sess.acls.get(d)
+                d.replicate(resource = newResc1)
+                acls_post = self.sess.acls.get(d)
+                self.assertEqual(len(acls_pre), len(acls_post))
+            finally:
+                if d:
+                    d.unlink(force = True)
 
     def _helper_for_testing_that_replicate_obeys_default_resource_setting__issue_459(self, get_session_function):
         with self.create_simple_resc() as newResc1: