remove unnecessary if else statement

iscai-msft · Aug 19, 2021 · 59fc8d5 · 59fc8d5
1 parent 62a8e5c
commit 59fc8d5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/sdk/core/azure-core/azure/core/rest/_helpers.py b/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:

diff --git a/sdk/core/azure-core/azure/core/rest/_rest.py b/sdk/core/azure-core/azure/core/rest/_rest.py
@@ -246,11 +246,8 @@ def text(self, encoding=None):
         :return: The response's content decoded as a string.
         """
         if self._text is None or encoding:
-            if not self.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):

diff --git a/sdk/core/azure-core/azure/core/rest/_rest_py3.py b/sdk/core/azure-core/azure/core/rest/_rest_py3.py
@@ -272,11 +272,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:
-            if not self.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: