API Core: fix pytype build (googleapis#6873)

tseaver · web-flow · commit 143b0423ddf5 · 2018-12-07T11:12:48.000-05:00
* Run 'pytype' only over the 'google/' directory.

* Ignore 'pytype_output/' derived files.

* Remove spurious 'MutableMapping.register' call.

'pytype' chokes on it, but the 'Policy' class already derives from
'MutableMapping', so the call is a no-op.

* Silence deprecation spew during IAM unit tests.
diff --git a/.gitignore b/.gitignore
@@ -69,3 +69,4 @@ generated_python/
 cloud-bigtable-client/
 googleapis-pb/
 grpc_python_venv/
+pytype_output/
diff --git a/api_core/google/api_core/iam.py b/api_core/google/api_core/iam.py
@@ -243,6 +243,3 @@ def to_api_repr(self):
                 del resource["bindings"]
 
         return resource
-
-
-collections_abc.MutableMapping.register(Policy)
diff --git a/api_core/setup.cfg b/api_core/setup.cfg
@@ -4,6 +4,6 @@ universal = 1
 [pytype]
 python_version = 3.6
 inputs =
-    .
+    google/
 exclude =
     tests/
diff --git a/api_core/tests/unit/test_iam.py b/api_core/tests/unit/test_iam.py
@@ -90,9 +90,12 @@ def test_owners_setter(self):
         MEMBER = "user:phred@example.com"
         expected = set([MEMBER])
         policy = self._make_one()
-        with warnings.catch_warnings():
-            warnings.simplefilter("always")
+
+        with warnings.catch_warnings(record=True) as warned:
             policy.owners = [MEMBER]
+
+        warning, = warned
+        assert warning.category is DeprecationWarning
         assert policy[OWNER_ROLE] == expected
 
     def test_editors_getter(self):
@@ -111,9 +114,12 @@ def test_editors_setter(self):
         MEMBER = "user:phred@example.com"
         expected = set([MEMBER])
         policy = self._make_one()
-        with warnings.catch_warnings():
-            warnings.simplefilter("always")
+
+        with warnings.catch_warnings(record=True) as warned:
             policy.editors = [MEMBER]
+
+        warning, = warned
+        assert warning.category is DeprecationWarning
         assert policy[EDITOR_ROLE] == expected
 
     def test_viewers_getter(self):
@@ -132,9 +138,12 @@ def test_viewers_setter(self):
         MEMBER = "user:phred@example.com"
         expected = set([MEMBER])
         policy = self._make_one()
-        with warnings.catch_warnings():
-            warnings.simplefilter("always")
+
+        with warnings.catch_warnings(record=True) as warned:
             policy.viewers = [MEMBER]
+
+        warning, = warned
+        assert warning.category is DeprecationWarning
         assert policy[VIEWER_ROLE] == expected
 
     def test_user(self):
@@ -240,17 +249,20 @@ def test_to_api_repr_binding_wo_members(self):
         assert policy.to_api_repr() == {}
 
     def test_to_api_repr_binding_w_duplicates(self):
+        import warnings
         from google.api_core.iam import OWNER_ROLE
 
         OWNER = "group:cloud-logs@google.com"
         policy = self._make_one()
-        policy.owners = [OWNER, OWNER]
+        with warnings.catch_warnings(record=True):
+            policy.owners = [OWNER, OWNER]
         assert policy.to_api_repr() == {
             "bindings": [{"role": OWNER_ROLE, "members": [OWNER]}]
         }
 
     def test_to_api_repr_full(self):
         import operator
+        import warnings
         from google.api_core.iam import OWNER_ROLE, EDITOR_ROLE, VIEWER_ROLE
 
         OWNER1 = "group:cloud-logs@google.com"
@@ -265,9 +277,10 @@ def test_to_api_repr_full(self):
             {"role": VIEWER_ROLE, "members": [VIEWER1, VIEWER2]},
         ]
         policy = self._make_one("DEADBEEF", 17)
-        policy.owners = [OWNER1, OWNER2]
-        policy.editors = [EDITOR1, EDITOR2]
-        policy.viewers = [VIEWER1, VIEWER2]
+        with warnings.catch_warnings(record=True):
+            policy.owners = [OWNER1, OWNER2]
+            policy.editors = [EDITOR1, EDITOR2]
+            policy.viewers = [VIEWER1, VIEWER2]
         resource = policy.to_api_repr()
         assert resource["etag"] == "DEADBEEF"
         assert resource["version"] == 17
