substitute set update with |= next
authorSofia Papagiannaki <papagian@gmail.com>
Sat, 21 Jul 2012 08:03:36 +0000 (11:03 +0300)
committerSofia Papagiannaki <papagian@gmail.com>
Sat, 21 Jul 2012 08:03:36 +0000 (11:03 +0300)
snf-pithos-backend/pithos/backends/modular.py

index 8b6458f..967eb02 100644 (file)
@@ -547,9 +547,9 @@ class ModularBackend(BaseBackend):
         else:
             allowed = set()
             if shared:
-                allowed.update(self.permissions.access_list_shared(path))
+                allowed |= set(self.permissions.access_list_shared(path))
             if public:
-                allowed.update([x[0] for x in self.permissions.public_list(path)])
+                allowed |= set([x[0] for x in self.permissions.public_list(path)])
             allowed = sorted(allowed)
             if not allowed:
                 return []