Re-generate library, removing obsolete synth modifications. (googleapis#5825)

theacodes · web-flow · commit d6fe5e17840c · 2018-08-21T12:48:22.000-05:00
diff --git a/pubsub/google/cloud/pubsub_v1/gapic/publisher_client.py b/pubsub/google/cloud/pubsub_v1/gapic/publisher_client.py
@@ -24,6 +24,7 @@
 import google.api_core.path_template
 import google.api_core.grpc_helpers
 import google.api_core.page_iterator
+import google.api_core.path_template
 import grpc
 
 from google.cloud.pubsub_v1.gapic import publisher_client_config
@@ -164,9 +165,6 @@ def __init__(self,
                 credentials=credentials,
             )
 
-        self.iam_policy_stub = (iam_policy_pb2.IAMPolicyStub(channel))
-        self.publisher_stub = (pubsub_pb2_grpc.PublisherStub(channel))
-
         if client_info is None:
             client_info = (
                 google.api_core.gapic_v1.client_info.DEFAULT_CLIENT_INFO)
diff --git a/pubsub/google/cloud/pubsub_v1/gapic/subscriber_client.py b/pubsub/google/cloud/pubsub_v1/gapic/subscriber_client.py
@@ -23,6 +23,7 @@
 import google.api_core.gapic_v1.method
 import google.api_core.grpc_helpers
 import google.api_core.page_iterator
+import google.api_core.path_template
 import google.api_core.protobuf_helpers
 import grpc
 
@@ -185,9 +186,6 @@ def __init__(self,
                 credentials=credentials,
             )
 
-        self.iam_policy_stub = (iam_policy_pb2.IAMPolicyStub(channel))
-        self.subscriber_stub = (pubsub_pb2_grpc.SubscriberStub(channel))
-
         if client_info is None:
             client_info = (
                 google.api_core.gapic_v1.client_info.DEFAULT_CLIENT_INFO)
diff --git a/pubsub/synth.py b/pubsub/synth.py
@@ -53,26 +53,6 @@
     ' pubsub_v1',
     ' subscriber_client')
 
-# iam_policy_pb2_grpc doesn't exist.
-s.replace(
-    ['google/cloud/pubsub_v1/gapic/publisher_client.py',
-     'google/cloud/pubsub_v1/gapic/subscriber_client.py'],
-    'from google.iam.v1 import iam_policy_pb2_grpc\n',
-    '')
-s.replace(
-    ['google/cloud/pubsub_v1/gapic/transports/publisher_grpc_transport.py',
-     'google/cloud/pubsub_v1/gapic/transports/subscriber_grpc_transport.py'],
-    'from google.iam.v1 import iam_policy_pb2_grpc\n',
-    'from google.iam.v1 import iam_policy_pb2\n')
-s.replace(
-    'google/cloud/pubsub_v1/gapic/transports/publisher_grpc_transport.py',
-    'iam_policy_pb2_grpc',
-    'iam_policy_pb2')
-s.replace(
-    'google/cloud/pubsub_v1/gapic/transports/subscriber_grpc_transport.py',
-    'iam_policy_pb2_grpc',
-    'iam_policy_pb2')
-
 # DEFAULT SCOPES are being used. so let's force them in.
 s.replace(
     'google/cloud/pubsub_v1/gapic/*er_client.py',
@@ -86,24 +66,6 @@
     \g<0>'''
 )
 
-
-# Stubs are missing
-s.replace(
-    'google/cloud/pubsub_v1/gapic/subscriber_client.py',
-    '^(\s+)if client_info is None:\n',
-    '\g<1>self.iam_policy_stub = (iam_policy_pb2.IAMPolicyStub(channel))'
-    '\g<1>self.subscriber_stub = (pubsub_pb2_grpc.SubscriberStub(channel))\n'
-    '\g<0>'
-)
-
-s.replace(
-    'google/cloud/pubsub_v1/gapic/publisher_client.py',
-    '^(\s+)if client_info is None:\n',
-    '\g<1>self.iam_policy_stub = (iam_policy_pb2.IAMPolicyStub(channel))'
-    '\g<1>self.publisher_stub = (pubsub_pb2_grpc.PublisherStub(channel))\n'
-    '\g<0>'
-)
-
 s.replace(
     'google/cloud/pubsub_v1/gapic/publisher_client.py',
     'import google.api_core.gapic_v1.method\n',
diff --git a/pubsub/tests/unit/pubsub_v1/publisher/test_publisher_client.py b/pubsub/tests/unit/pubsub_v1/publisher/test_publisher_client.py
@@ -46,7 +46,7 @@ def test_init_emulator(monkeypatch):
     #
     # Sadly, there seems to be no good way to do this without poking at
     # the private API of gRPC.
-    channel = client.api.publisher_stub.Publish._channel
+    channel = client.api.transport.publish._channel
     assert channel.target().decode('utf8') == '/foo/bar/'
 
 
diff --git a/pubsub/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py b/pubsub/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py
@@ -36,7 +36,7 @@ def test_init_emulator(monkeypatch):
     #
     # Sadly, there seems to be no good way to do this without poking at
     # the private API of gRPC.
-    channel = client.api.subscriber_stub.Pull._channel
+    channel = client.api.transport.pull._channel
     assert channel.target().decode('utf8') == '/baz/bacon/'
 
 

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ def test_init_emulator(monkeypatch):`
`46`	`46`	`#`
`47`	`47`	`# Sadly, there seems to be no good way to do this without poking at`
`48`	`48`	`# the private API of gRPC.`
`49`		`- channel = client.api.publisher_stub.Publish._channel`
	`49`	`+ channel = client.api.transport.publish._channel`
`50`	`50`	`assert channel.target().decode('utf8') == '/foo/bar/'`
`51`	`51`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ def test_init_emulator(monkeypatch):`
`36`	`36`	`#`
`37`	`37`	`# Sadly, there seems to be no good way to do this without poking at`
`38`	`38`	`# the private API of gRPC.`
`39`		`- channel = client.api.subscriber_stub.Pull._channel`
	`39`	`+ channel = client.api.transport.pull._channel`
`40`	`40`	`assert channel.target().decode('utf8') == '/baz/bacon/'`
`41`	`41`
`42`	`42`