temp

Author: iscai-msft

sdk/core/azure-core/azure/core/rest/_requests_basic.py

@@ -32,10 +32,14 @@
 from ..pipeline.transport._requests_basic import StreamDownloadGenerator
 
 class _ItemsView(collections.ItemsView):
+
+    def __init__(self, ref):
+        self._ref = ref
+
     def __contains__(self, item):
         if not (isinstance(item, (list, tuple)) and len(item) == 2):
             return False  # requests raises here, we just return False
-        for k, v in self.__iter__():
+        for k, v in self._ref.__iter__():
             if item[0].lower() == k.lower() and item[1] == v:
                 return True
         return False
@@ -51,7 +55,7 @@ class _CaseInsensitiveDict(CaseInsensitiveDict):
 
     def items(self):
         """Return a new view of the dictionary's items."""
-        return _ItemsView(self)
+        return _ItemsView(super(_CaseInsensitiveDict, self).items())
 
 
 if TYPE_CHECKING:

sdk/core/azure-core/azure/core/rest/_rest_py3.py

@@ -222,13 +222,11 @@ class _HttpResponseBase:  # pylint: disable=too-many-instance-attributes
     def __init__(
         self,
         *,
-        request: HttpRequest,
-        **kwargs
+        request: HttpRequest
     ):
         self.request = request
-        self._internal_response = kwargs.pop("internal_response")
         self.status_code = None
-        self.headers = {}  # type: HeadersType
+        self.headers = _case_insensitive_dict({})
         self.reason = None
         self.is_closed = False
         self.is_stream_consumed = False
@@ -285,7 +283,7 @@ def json(self) -> Any:
         """
         # this will trigger errors if response is not read in
         self.content  # pylint: disable=pointless-statement
-        if not self._json:
+        if self._json is None:
             self._json = loads(self.text())
         return self._json
 

sdk/core/azure-core/tests/async_tests/test_rest_headers_async.py

@@ -7,6 +7,8 @@
 import pytest
 import platform
 from azure.core.rest import HttpRequest
+import aiohttp
+from azure.core.rest._aiohttp import RestAioHttpTransportResponse
 
 # flask returns these response headers, which we don't really need for these following tests
 RESPONSE_HEADERS_TO_IGNORE = [

sdk/core/azure-core/tests/test_rest_headers.py

@@ -4,8 +4,9 @@
 # license information.
 # -------------------------------------------------------------------------
 import sys
-from typing import ValuesView
+from requests import Response
 import pytest
+from azure.core.rest._requests_basic import RestRequestsTransportResponse
 
 # NOTE: These tests are heavily inspired from the httpx test suite: https://github.com/encode/httpx/tree/master/tests
 # Thank you httpx for your wonderful tests!
@@ -247,4 +248,12 @@ def test_multiple_headers_duplicate_case_insensitive(get_response_headers):
 
 def test_multiple_headers_commas(get_response_headers):
     h = get_response_headers(HttpRequest("GET", "/headers/duplicate/commas"))
-    assert h["Set-Cookie"] == "a,  b, c"
+    assert h["Set-Cookie"] == "a,  b, c"
+
+def test_headers_link():
+    headers = {}
+    internal_response = Response()
+    internal_response.headers = headers
+    response = RestRequestsTransportResponse(request=None, internal_response=internal_response)
+    headers["Update"] = "foo"
+    assert response.headers["Update"] == "foo"