From d99800652236b54583b0cd869ba81a327ef93fb3 Mon Sep 17 00:00:00 2001 From: Libba Lawrence Date: Tue, 23 May 2023 14:50:17 -0700 Subject: [PATCH] [EGv2] Eg typing/formatting (#30492) * mypy pylint * update samples * remove version disclaimer --- .../eventgrid/_operations/_operations.py | 19 ++----------------- .../eventgrid/aio/_operations/_operations.py | 4 ++-- .../sample_acknowledge_operation_async.py | 2 +- .../sample_all_operations_async.py | 5 +++-- .../sample_publish_operation_async.py | 2 +- .../sample_receive_operation_async.py | 2 +- .../sample_reject_operation_async.py | 2 +- .../sample_release_operation_async.py | 2 +- 8 files changed, 12 insertions(+), 26 deletions(-) diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_operations/_operations.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_operations/_operations.py index 71a965588424..63e9753a018b 100644 --- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_operations/_operations.py +++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_operations/_operations.py @@ -29,8 +29,6 @@ def build_event_grid_publish_cloud_event_request( topic_name: str, - *, - content: _models._models.CloudEvent, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) @@ -57,15 +55,12 @@ def build_event_grid_publish_cloud_event_request( url=_url, params=_params, headers=_headers, - content=content, **kwargs ) def build_event_grid_publish_cloud_events_request( topic_name: str, - *, - content: List[_models._models.CloudEvent], **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) @@ -92,7 +87,6 @@ def build_event_grid_publish_cloud_events_request( url=_url, params=_params, headers=_headers, - content=content, **kwargs ) @@ -142,8 +136,6 @@ def build_event_grid_receive_cloud_events_request( def build_event_grid_acknowledge_cloud_events_request( topic_name: str, event_subscription_name: str, - *, - content: _models.AcknowledgeOptions, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) @@ -174,7 +166,6 @@ def build_event_grid_acknowledge_cloud_events_request( url=_url, params=_params, headers=_headers, - content=content, **kwargs ) @@ -182,8 +173,6 @@ def build_event_grid_acknowledge_cloud_events_request( def build_event_grid_release_cloud_events_request( topic_name: str, event_subscription_name: str, - *, - content: _models.ReleaseOptions, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) @@ -214,7 +203,6 @@ def build_event_grid_release_cloud_events_request( url=_url, params=_params, headers=_headers, - content=content, **kwargs ) @@ -222,8 +210,6 @@ def build_event_grid_release_cloud_events_request( def build_event_grid_reject_cloud_events_request( topic_name: str, event_subscription_name: str, - *, - content: _models.RejectOptions, **kwargs: Any ) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) @@ -254,14 +240,13 @@ def build_event_grid_reject_cloud_events_request( url=_url, params=_params, headers=_headers, - content=content, **kwargs ) class EventGridClientOperationsMixin(EventGridClientMixinABC): @distributed_trace - def _publish_cloud_event( # pylint: disable=inconsistent-return-statements + def _publish_cloud_event( # pylint: disable=inconsistent-return-statements,protected-access self, topic_name: str, event: _models._models.CloudEvent, @@ -405,7 +390,7 @@ def _publish_cloud_events( # pylint: disable=inconsistent-return-statements @distributed_trace - def _receive_cloud_events( + def _receive_cloud_events( # pylint: disable=protected-access self, topic_name: str, event_subscription_name: str, diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_operations/_operations.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_operations/_operations.py index deb44505d8a2..9a15d090bd8b 100644 --- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_operations/_operations.py +++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_operations/_operations.py @@ -26,7 +26,7 @@ class EventGridClientOperationsMixin(EventGridClientMixinABC): @distributed_trace_async - async def _publish_cloud_event( # pylint: disable=inconsistent-return-statements + async def _publish_cloud_event( # pylint: disable=inconsistent-return-statements,protected-access self, topic_name: str, event: _models._models.CloudEvent, @@ -170,7 +170,7 @@ async def _publish_cloud_events( # pylint: disable=inconsistent-return-statemen @distributed_trace_async - async def _receive_cloud_events( + async def _receive_cloud_events( # pylint: disable=protected-access self, topic_name: str, event_subscription_name: str, diff --git a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_acknowledge_operation_async.py b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_acknowledge_operation_async.py index 79d2d4f9631e..d858b811d1f9 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_acknowledge_operation_async.py +++ b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_acknowledge_operation_async.py @@ -35,4 +35,4 @@ async def run(): if __name__ == "__main__": - asyncio.run(run()) + asyncio.get_event_loop().run_until_complete(run()) diff --git a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_all_operations_async.py b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_all_operations_async.py index 47d1615d7656..61d089485bf4 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_all_operations_async.py +++ b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_all_operations_async.py @@ -32,7 +32,7 @@ ) -async def main(): +async def run(): async with client: # Publish a CloudEvent try: @@ -123,4 +123,5 @@ async def main(): print(f"Succeeded Lock Token:{succeeded_lock_token}") -asyncio.run(main()) +if __name__ == "__main__": + asyncio.get_event_loop().run_until_complete(run()) diff --git a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_publish_operation_async.py b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_publish_operation_async.py index 21966b77dc55..c8b321fd7f12 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_publish_operation_async.py +++ b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_publish_operation_async.py @@ -43,4 +43,4 @@ async def run(): if __name__ == "__main__": - asyncio.run(run()) + asyncio.get_event_loop().run_until_complete(run()) diff --git a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_receive_operation_async.py b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_receive_operation_async.py index 0d0a94876bfe..b483a2f0abed 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_receive_operation_async.py +++ b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_receive_operation_async.py @@ -35,4 +35,4 @@ async def run(): if __name__ == "__main__": - asyncio.run(run()) + asyncio.get_event_loop().run_until_complete(run()) diff --git a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_reject_operation_async.py b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_reject_operation_async.py index c9de1fbd4817..d493e9055736 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_reject_operation_async.py +++ b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_reject_operation_async.py @@ -35,4 +35,4 @@ async def run(): if __name__ == "__main__": - asyncio.run(run()) + asyncio.get_event_loop().run_until_complete(run()) diff --git a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_release_operation_async.py b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_release_operation_async.py index eb423e2f5827..df57e7474b61 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_release_operation_async.py +++ b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_release_operation_async.py @@ -35,4 +35,4 @@ async def run(): if __name__ == "__main__": - asyncio.run(run()) + asyncio.get_event_loop().run_until_complete(run())