Remove six use in azure-sdk-tools (Azure#42665)

Author: mccoyp

eng/tools/azure-sdk-tools/devtools_testutils/azure_recorded_testcase.py

@@ -6,12 +6,8 @@
 import functools
 import logging
 import os
-import os.path
-import re
-import six
 import sys
 import time
-from typing import Dict
 
 from dotenv import load_dotenv, find_dotenv
 
@@ -24,7 +20,6 @@
 from .fake_credentials import SANITIZED
 from .fake_credentials_async import AsyncFakeCredential
 from .helpers import is_live, trim_kwargs_from_test_function
-from .sanitizers import add_general_string_sanitizer
 
 
 _LOGGER = logging.getLogger()
@@ -77,7 +72,7 @@ def get_settings_value(self, key):
             try:
                 key_value = getattr(self.settings, key)
             except Exception as ex:
-                six.raise_from(ValueError("Could not get {}".format(key)), ex)
+                raise ValueError(f"Could not get {key}") from ex
         return key_value
 
     def get_credential(self, client_class, **kwargs):

eng/tools/azure-sdk-tools/devtools_testutils/proxy_testcase.py

@@ -4,7 +4,6 @@
 # license information.
 # --------------------------------------------------------------------------
 import logging
-import six
 import os
 from typing import TYPE_CHECKING, Optional
 import urllib.parse as url_parse
@@ -87,8 +86,7 @@ def start_record_or_playback(test_id: str) -> "Tuple[str, Dict[str, str]]":
             body=encoded_payload,
         )
         if result.status != 200:
-            message = six.ensure_str(result.data)
-            raise HttpResponseError(message=message)
+            raise HttpResponseError(message=result.data)
         recording_id = result.headers["x-recording-id"]
 
     else:
@@ -98,21 +96,17 @@ def start_record_or_playback(test_id: str) -> "Tuple[str, Dict[str, str]]":
             body=encoded_payload,
         )
         if result.status != 200:
-            message = six.ensure_str(result.data)
-            raise HttpResponseError(message=message)
+            raise HttpResponseError(message=result.data)
 
         try:
             recording_id = result.headers["x-recording-id"]
         except KeyError as ex:
-            six.raise_from(ValueError("No recording file found for {}".format(test_id)), ex)
+            raise ValueError(f"No recording file found for {test_id}") from ex
         if result.data:
             try:
                 variables = json.loads(result.data.decode("utf-8"))
-            except ValueError as ex:  # would be a JSONDecodeError on Python 3, which subclasses ValueError
-                six.raise_from(
-                    ValueError("The response body returned from starting playback did not contain valid JSON"),
-                    ex,
-                )
+            except ValueError as ex:  # would be a JSONDecodeError, which subclasses ValueError
+                raise ValueError("The response body returned from starting playback did not contain valid JSON") from ex
 
     # set recording ID in a module-level variable so that sanitizers can access it
     set_recording_id(test_id, recording_id)
@@ -245,7 +239,7 @@ def combined_call(*args, **kwargs):
                 message=f"{troubleshoot} Error details:\n{message}",
                 response=error.response,
             )
-            six.raise_from(error_with_message, error)
+            raise error_with_message from error
 
         finally:
             RequestsTransport.send = original_transport_func