Merge branch 'test_to_function' of https://github.com/iscai-msft/azur…

…e-sdk-for-python into have_pipelines_support_rest

* 'test_to_function' of https://github.com/iscai-msft/azure-sdk-for-python:
  remove unnecessary if else statement
  remove unnecessary content setting
  convert to unicode str
  unify text and encoding accross transports

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

@@ -293,6 +293,8 @@ def get_charset_encoding(response):
 
 def decode_to_text(encoding, content):
     # type: (Optional[str], bytes) -> str
+    if not content:
+        return ""
     if encoding == "utf-8":
         encoding = "utf-8-sig"
     if encoding:

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

@@ -61,19 +61,6 @@ def content(self):
             # requests throws a RuntimeError if the content for a response is already consumed
             raise ResponseNotReadError(self)
 
-    @_HttpResponseBase.encoding.setter  # type: ignore
-    def encoding(self, value):
-        # type: (str) -> None
-        _HttpResponseBase.encoding.fset(self, value)
-        self._internal_response.encoding = value
-
-    def text(self, encoding=None):
-        # this will trigger errors if response is not read in
-        self.content  # pylint: disable=pointless-statement
-        if encoding:
-            self._internal_response.encoding = encoding
-        return self._internal_response.text
-
 def _stream_download_helper(decompress, response):
     if response.is_stream_consumed:
         raise StreamConsumedError(response)

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

@@ -247,12 +247,8 @@ def text(self, encoding=None):
         :return: The response's content decoded as a string.
         """
         if self._text is None or encoding:
-            content = self.content
-            if not content:
-                self._text = ""
-            else:
-                encoding_to_pass = encoding or self.encoding
-                self._text = decode_to_text(encoding_to_pass, self.content)
+            encoding_to_pass = encoding or self.encoding
+            self._text = decode_to_text(encoding_to_pass, self.content)
         return self._text
 
     def json(self):

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

@@ -274,12 +274,8 @@ def text(self, encoding: Optional[str] = None) -> str:
         :return: The response's content decoded as a string.
         """
         if self._text is None or encoding:
-            content = self.content
-            if not content:
-                self._text = ""
-            else:
-                encoding_to_pass = encoding or self.encoding
-                self._text = decode_to_text(encoding_to_pass, self.content)
+            encoding_to_pass = encoding or self.encoding
+            self._text = decode_to_text(encoding_to_pass, self.content)
         return self._text
 
     def json(self) -> Any:

sdk/core/azure-core/tests/testserver_tests/async_tests/test_rest_http_response_async.py

@@ -159,14 +159,14 @@ async def test_response_no_charset_with_ascii_content(send_request):
 @pytest.mark.asyncio
 async def test_response_no_charset_with_iso_8859_1_content(send_request):
     """
-    A response with ISO 8859-1 encoded content should decode correctly,
-    even with no charset specified.
+    We don't support iso-8859-1 by default following conversations
+    about endoding flow
     """
     response = await send_request(
         request=HttpRequest("GET", "/encoding/iso-8859-1"),
     )
     await response.read()
-    assert response.text() == "Accented: �sterreich" # aiohttp is having diff behavior than requests
+    assert response.text() == "Accented: �sterreich"
     assert response.encoding is None
 
 # NOTE: aiohttp isn't liking this

sdk/core/azure-core/tests/testserver_tests/test_rest_http_response.py

@@ -144,13 +144,13 @@ def test_response_no_charset_with_ascii_content(send_request):
 
 def test_response_no_charset_with_iso_8859_1_content(send_request):
     """
-    A response with ISO 8859-1 encoded content should decode correctly,
-    even with no charset specified.
+    We don't support iso-8859-1 by default following conversations
+    about endoding flow
     """
     response = send_request(
         request=HttpRequest("GET", "/encoding/iso-8859-1"),
     )
-    assert response.text() == u"Accented: Österreich"
+    assert response.text() == u"Accented: �sterreich"
     assert response.encoding is None
 
 def test_response_set_explicit_encoding(send_request):
@@ -309,5 +309,5 @@ def test_text_and_encoding(send_request):
     assert response.text() == u"鿰ꦑ" == response.content.decode(response.encoding)
 
     # assert latin-1 changes text decoding without changing encoding property
-    assert response.text("latin-1") == 'ð\x9f\x91©' == response.content.decode("latin-1")
+    assert response.text("latin-1") == u'ð\x9f\x91©' == response.content.decode("latin-1")
     assert response.encoding == "utf-16"