From 83863f7a6e8310480f9e55f3e399835ececd0439 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Thu, 30 Jan 2025 07:20:59 -0500 Subject: [PATCH] ci: remove usage of deprecated stream interface Signed-off-by: Vincent Biret --- src/msgraph_core/requests/batch_request_item.py | 2 ++ tests/requests/test_batch_request_content.py | 7 ++++--- tests/requests/test_batch_request_item.py | 9 ++++----- tests/requests/test_batch_response_item.py | 6 +++--- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/msgraph_core/requests/batch_request_item.py b/src/msgraph_core/requests/batch_request_item.py index bc39f0c6..d7818736 100644 --- a/src/msgraph_core/requests/batch_request_item.py +++ b/src/msgraph_core/requests/batch_request_item.py @@ -3,6 +3,7 @@ import json import re import urllib.request +from deprecated import deprecated from io import BytesIO from typing import Any, Optional, Union from urllib.parse import urlparse @@ -14,6 +15,7 @@ from kiota_abstractions.serialization import Parsable, ParseNode, SerializationWriter +@deprecated("Use BytesIO type instead") class StreamInterface(BytesIO): pass diff --git a/tests/requests/test_batch_request_content.py b/tests/requests/test_batch_request_content.py index 43d8e2fb..81cac044 100644 --- a/tests/requests/test_batch_request_content.py +++ b/tests/requests/test_batch_request_content.py @@ -1,4 +1,5 @@ import pytest +from io import BytesIO from unittest.mock import Mock from urllib.request import Request from kiota_abstractions.request_information import RequestInformation @@ -6,7 +7,7 @@ from msgraph_core.requests.batch_request_item import BatchRequestItem from msgraph_core.requests.batch_request_content import BatchRequestContent from kiota_abstractions.headers_collection import HeadersCollection as RequestHeaders -from msgraph_core.requests.batch_request_item import BatchRequestItem, StreamInterface +from msgraph_core.requests.batch_request_item import BatchRequestItem @pytest.fixture @@ -16,7 +17,7 @@ def request_info1(): request_info.url = "https://graph.microsoft.com/v1.0/me" request_info.headers = RequestHeaders() request_info.headers.add("Content-Type", "application/json") - request_info.content = StreamInterface(b'{"key": "value"}') + request_info.content = BytesIO(b'{"key": "value"}') return request_info @@ -27,7 +28,7 @@ def request_info2(): request_info.url = "https://graph.microsoft.com/v1.0/users" request_info.headers = RequestHeaders() request_info.headers.add("Content-Type", "application/json") - request_info.content = StreamInterface(b'{"key": "value"}') + request_info.content = BytesIO(b'{"key": "value"}') return request_info diff --git a/tests/requests/test_batch_request_item.py b/tests/requests/test_batch_request_item.py index 2aeeffb4..1f3dd971 100644 --- a/tests/requests/test_batch_request_item.py +++ b/tests/requests/test_batch_request_item.py @@ -1,11 +1,10 @@ import pytest -from unittest.mock import Mock +from io import BytesIO from urllib.request import Request from kiota_abstractions.request_information import RequestInformation from kiota_abstractions.method import Method from kiota_abstractions.headers_collection import HeadersCollection as RequestHeaders -from msgraph_core.requests.batch_request_item import BatchRequestItem, StreamInterface -from kiota_abstractions.serialization import SerializationWriter +from msgraph_core.requests.batch_request_item import BatchRequestItem base_url = "https://graph.microsoft.com/v1.0/me" @@ -16,7 +15,7 @@ def request_info(): request_info.http_method = "GET" request_info.url = "f{base_url}/me" request_info.headers = RequestHeaders() - request_info.content = StreamInterface(b'{"key": "value"}') + request_info.content = BytesIO(b'{"key": "value"}') return request_info @@ -100,7 +99,7 @@ def test_headers_property(batch_request_item): def test_body_property(batch_request_item): - new_body = StreamInterface(b'{"new_key": "new_value"}') + new_body = BytesIO(b'{"new_key": "new_value"}') batch_request_item.body = new_body assert batch_request_item.body == b'{"new_key": "new_value"}' diff --git a/tests/requests/test_batch_response_item.py b/tests/requests/test_batch_response_item.py index 5d34d6b4..9d644336 100644 --- a/tests/requests/test_batch_response_item.py +++ b/tests/requests/test_batch_response_item.py @@ -4,7 +4,7 @@ from kiota_abstractions.serialization import ParseNode, SerializationWriter from unittest.mock import Mock -from msgraph_core.requests.batch_response_item import BatchResponseItem, StreamInterface +from msgraph_core.requests.batch_response_item import BatchResponseItem @pytest.fixture @@ -42,7 +42,7 @@ def test_headers_property(batch_response_item): def test_body_property(batch_response_item): - body = StreamInterface(b"response body") + body = BytesIO(b"response body") batch_response_item.body = body assert batch_response_item.body == body @@ -74,7 +74,7 @@ def test_serialize(batch_response_item): batch_response_item.atomicity_group = "group1" batch_response_item.status = 200 batch_response_item.headers = {"Content-Type": "application/json"} - batch_response_item.body = StreamInterface(b"response body") + batch_response_item.body = BytesIO(b"response body") batch_response_item.serialize(writer) writer.write_str_value.assert_any_call('id', "12345") writer.write_str_value.assert_any_call('atomicity_group', "group1")