Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/msgraph_core/requests/batch_request_item.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -14,6 +15,7 @@
from kiota_abstractions.serialization import Parsable, ParseNode, SerializationWriter


@deprecated("Use BytesIO type instead")
class StreamInterface(BytesIO):
pass

Expand Down
7 changes: 4 additions & 3 deletions tests/requests/test_batch_request_content.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import pytest
from io import BytesIO
from unittest.mock import Mock
from urllib.request import Request
from kiota_abstractions.request_information import RequestInformation
from kiota_abstractions.serialization import SerializationWriter
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
Expand All @@ -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


Expand All @@ -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


Expand Down
9 changes: 4 additions & 5 deletions tests/requests/test_batch_request_item.py
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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


Expand Down Expand Up @@ -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"}'

Expand Down
6 changes: 3 additions & 3 deletions tests/requests/test_batch_response_item.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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")
Expand Down