Return frozensets from named Policy properties.

tseaver · tseaver · commit 2196802e18f9 · 2017-04-05T19:43:07.000-04:00
Updating them in place never actually worked (they were sets created
on the fly), but at least we give an appropriate error now if the
user tries.
diff --git a/core/google/cloud/iam.py b/core/google/cloud/iam.py
@@ -62,7 +62,7 @@ def owners(self):
         for role in self._OWNER_ROLES:
             for member in self.bindings.get(role, ()):
                 result.add(member)
-        return result
+        return frozenset(result)
 
     @owners.setter
     def owners(self, value):
@@ -76,7 +76,7 @@ def editors(self):
         for role in self._EDITOR_ROLES:
             for member in self.bindings.get(role, ()):
                 result.add(member)
-        return result
+        return frozenset(result)
 
     @editors.setter
     def editors(self, value):
@@ -90,7 +90,7 @@ def viewers(self):
         for role in self._VIEWER_ROLES:
             for member in self.bindings.get(role, ()):
                 result.add(member)
-        return result
+        return frozenset(result)
 
     @viewers.setter
     def viewers(self, value):
diff --git a/core/tests/unit/test_iam.py b/core/tests/unit/test_iam.py
@@ -30,8 +30,11 @@ def test_ctor_defaults(self):
         policy = self._make_one()
         self.assertIsNone(policy.etag)
         self.assertIsNone(policy.version)
+        self.assertIsInstance(policy.owners, frozenset)
         self.assertEqual(list(policy.owners), [])
+        self.assertIsInstance(policy.editors, frozenset)
         self.assertEqual(list(policy.editors), [])
+        self.assertIsInstance(policy.viewers, frozenset)
         self.assertEqual(list(policy.viewers), [])
         self.assertEqual(dict(policy.bindings), {})
 
diff --git a/pubsub/google/cloud/pubsub/iam.py b/pubsub/google/cloud/pubsub/iam.py
@@ -109,7 +109,7 @@ class Policy(_BasePolicy):
     @property
     def publishers(self):
         """Legacy access to owner role."""
-        return self.bindings.get(PUBSUB_PUBLISHER_ROLE, ())
+        return frozenset(self.bindings.get(PUBSUB_PUBLISHER_ROLE, ()))
 
     @publishers.setter
     def publishers(self, value):
@@ -119,7 +119,7 @@ def publishers(self, value):
     @property
     def subscribers(self):
         """Legacy access to owner role."""
-        return self.bindings.get(PUBSUB_SUBSCRIBER_ROLE, ())
+        return frozenset(self.bindings.get(PUBSUB_SUBSCRIBER_ROLE, ()))
 
     @subscribers.setter
     def subscribers(self, value):
diff --git a/pubsub/tests/unit/test_iam.py b/pubsub/tests/unit/test_iam.py
@@ -30,10 +30,15 @@ def test_ctor_defaults(self):
         policy = self._make_one()
         self.assertIsNone(policy.etag)
         self.assertIsNone(policy.version)
+        self.assertIsInstance(policy.owners, frozenset)
         self.assertEqual(list(policy.owners), [])
+        self.assertIsInstance(policy.editors, frozenset)
         self.assertEqual(list(policy.editors), [])
+        self.assertIsInstance(policy.viewers, frozenset)
         self.assertEqual(list(policy.viewers), [])
+        self.assertIsInstance(policy.publishers, frozenset)
         self.assertEqual(list(policy.publishers), [])
+        self.assertIsInstance(policy.subscribers, frozenset)
         self.assertEqual(list(policy.subscribers), [])
 
     def test_ctor_explicit(self):
