From 717f7a0e1683ba9b7ce8a5fd1559cc0ba6fd55f3 Mon Sep 17 00:00:00 2001 From: Tianzi Cai Date: Tue, 2 Jun 2020 16:40:09 -0700 Subject: [PATCH 1/2] fix: make timeout an optional positional arg --- pubsub/cloud-client/subscriber.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pubsub/cloud-client/subscriber.py b/pubsub/cloud-client/subscriber.py index b5af760aed4..ad54ecb47e9 100644 --- a/pubsub/cloud-client/subscriber.py +++ b/pubsub/cloud-client/subscriber.py @@ -309,7 +309,7 @@ def remove_dead_letter_policy(project_id, topic_name, subscription_name): return subscription_after_update -def receive_messages(project_id, subscription_name, timeout=None): +def receive_messages(project_id, subscription_name, timeout): """Receives messages from a pull subscription.""" # [START pubsub_subscriber_async_pull] # [START pubsub_quickstart_subscriber] @@ -678,7 +678,7 @@ def callback(message): receive_parser = subparsers.add_parser("receive", help=receive_messages.__doc__) receive_parser.add_argument("subscription_name") - receive_parser.add_argument("--timeout", default=None, type=float) + receive_parser.add_argument("timeout", default=None, type=float, nargs="?") receive_with_custom_attributes_parser = subparsers.add_parser( "receive-custom-attributes", @@ -686,14 +686,16 @@ def callback(message): ) receive_with_custom_attributes_parser.add_argument("subscription_name") receive_with_custom_attributes_parser.add_argument( - "--timeout", default=None, type=float + "timeout", default=None, type=float, nargs="?" ) receive_with_flow_control_parser = subparsers.add_parser( "receive-flow-control", help=receive_messages_with_flow_control.__doc__ ) receive_with_flow_control_parser.add_argument("subscription_name") - receive_with_flow_control_parser.add_argument("--timeout", default=None, type=float) + receive_with_flow_control_parser.add_argument( + "timeout", default=None, type=float, nargs="?" + ) synchronous_pull_parser = subparsers.add_parser( "receive-synchronously", help=synchronous_pull.__doc__ @@ -710,7 +712,9 @@ def callback(message): "listen-for-errors", help=listen_for_errors.__doc__ ) listen_for_errors_parser.add_argument("subscription_name") - listen_for_errors_parser.add_argument("--timeout", default=None, type=float) + listen_for_errors_parser.add_argument( + "timeout", default=None, type=float, nargs="?" + ) receive_messages_with_delivery_attempts_parser = subparsers.add_parser( "receive-messages-with-delivery-attempts", @@ -718,7 +722,7 @@ def callback(message): ) receive_messages_with_delivery_attempts_parser.add_argument("subscription_name") receive_messages_with_delivery_attempts_parser.add_argument( - "--timeout", default=None, type=float + "timeout", default=None, type=float, nargs="?" ) args = parser.parse_args() From 5d342d6d79a8f0853c69c15e36ba091c5f6b5737 Mon Sep 17 00:00:00 2001 From: Tianzi Cai Date: Tue, 2 Jun 2020 16:44:17 -0700 Subject: [PATCH 2/2] place `none` back in function signature --- pubsub/cloud-client/subscriber.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubsub/cloud-client/subscriber.py b/pubsub/cloud-client/subscriber.py index ad54ecb47e9..5dc468e23a8 100644 --- a/pubsub/cloud-client/subscriber.py +++ b/pubsub/cloud-client/subscriber.py @@ -309,7 +309,7 @@ def remove_dead_letter_policy(project_id, topic_name, subscription_name): return subscription_after_update -def receive_messages(project_id, subscription_name, timeout): +def receive_messages(project_id, subscription_name, timeout=None): """Receives messages from a pull subscription.""" # [START pubsub_subscriber_async_pull] # [START pubsub_quickstart_subscriber]