Skip to content

Commit 91a2ffe

Browse files
authored
Merge pull request #821 from microsoftgraph/ci/remove-deprecated-usage
ci: remove usage of deprecated stream interface
2 parents e6ca6dc + 83863f7 commit 91a2ffe

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

src/msgraph_core/requests/batch_request_item.py

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import json
44
import re
55
import urllib.request
6+
from deprecated import deprecated
67
from io import BytesIO
78
from typing import Any, Optional, Union
89
from urllib.parse import urlparse
@@ -14,6 +15,7 @@
1415
from kiota_abstractions.serialization import Parsable, ParseNode, SerializationWriter
1516

1617

18+
@deprecated("Use BytesIO type instead")
1719
class StreamInterface(BytesIO):
1820
pass
1921

tests/requests/test_batch_request_content.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import pytest
2+
from io import BytesIO
23
from unittest.mock import Mock
34
from urllib.request import Request
45
from kiota_abstractions.request_information import RequestInformation
56
from kiota_abstractions.serialization import SerializationWriter
67
from msgraph_core.requests.batch_request_item import BatchRequestItem
78
from msgraph_core.requests.batch_request_content import BatchRequestContent
89
from kiota_abstractions.headers_collection import HeadersCollection as RequestHeaders
9-
from msgraph_core.requests.batch_request_item import BatchRequestItem, StreamInterface
10+
from msgraph_core.requests.batch_request_item import BatchRequestItem
1011

1112

1213
@pytest.fixture
@@ -16,7 +17,7 @@ def request_info1():
1617
request_info.url = "https://graph.microsoft.com/v1.0/me"
1718
request_info.headers = RequestHeaders()
1819
request_info.headers.add("Content-Type", "application/json")
19-
request_info.content = StreamInterface(b'{"key": "value"}')
20+
request_info.content = BytesIO(b'{"key": "value"}')
2021
return request_info
2122

2223

@@ -27,7 +28,7 @@ def request_info2():
2728
request_info.url = "https://graph.microsoft.com/v1.0/users"
2829
request_info.headers = RequestHeaders()
2930
request_info.headers.add("Content-Type", "application/json")
30-
request_info.content = StreamInterface(b'{"key": "value"}')
31+
request_info.content = BytesIO(b'{"key": "value"}')
3132
return request_info
3233

3334

tests/requests/test_batch_request_item.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import pytest
2-
from unittest.mock import Mock
2+
from io import BytesIO
33
from urllib.request import Request
44
from kiota_abstractions.request_information import RequestInformation
55
from kiota_abstractions.method import Method
66
from kiota_abstractions.headers_collection import HeadersCollection as RequestHeaders
7-
from msgraph_core.requests.batch_request_item import BatchRequestItem, StreamInterface
8-
from kiota_abstractions.serialization import SerializationWriter
7+
from msgraph_core.requests.batch_request_item import BatchRequestItem
98

109
base_url = "https://graph.microsoft.com/v1.0/me"
1110

@@ -16,7 +15,7 @@ def request_info():
1615
request_info.http_method = "GET"
1716
request_info.url = "f{base_url}/me"
1817
request_info.headers = RequestHeaders()
19-
request_info.content = StreamInterface(b'{"key": "value"}')
18+
request_info.content = BytesIO(b'{"key": "value"}')
2019
return request_info
2120

2221

@@ -100,7 +99,7 @@ def test_headers_property(batch_request_item):
10099

101100

102101
def test_body_property(batch_request_item):
103-
new_body = StreamInterface(b'{"new_key": "new_value"}')
102+
new_body = BytesIO(b'{"new_key": "new_value"}')
104103
batch_request_item.body = new_body
105104
assert batch_request_item.body == b'{"new_key": "new_value"}'
106105

tests/requests/test_batch_response_item.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from kiota_abstractions.serialization import ParseNode, SerializationWriter
55
from unittest.mock import Mock
66

7-
from msgraph_core.requests.batch_response_item import BatchResponseItem, StreamInterface
7+
from msgraph_core.requests.batch_response_item import BatchResponseItem
88

99

1010
@pytest.fixture
@@ -42,7 +42,7 @@ def test_headers_property(batch_response_item):
4242

4343

4444
def test_body_property(batch_response_item):
45-
body = StreamInterface(b"response body")
45+
body = BytesIO(b"response body")
4646
batch_response_item.body = body
4747
assert batch_response_item.body == body
4848

@@ -74,7 +74,7 @@ def test_serialize(batch_response_item):
7474
batch_response_item.atomicity_group = "group1"
7575
batch_response_item.status = 200
7676
batch_response_item.headers = {"Content-Type": "application/json"}
77-
batch_response_item.body = StreamInterface(b"response body")
77+
batch_response_item.body = BytesIO(b"response body")
7878
batch_response_item.serialize(writer)
7979
writer.write_str_value.assert_any_call('id', "12345")
8080
writer.write_str_value.assert_any_call('atomicity_group', "group1")

0 commit comments

Comments
 (0)