From e016b9bbc19fd78894e39b49e285d82143c0e475 Mon Sep 17 00:00:00 2001
From: Xiang Yan <xiangsjtu@gmail.com>
Date: Mon, 26 Jun 2023 17:06:55 -0700
Subject: [PATCH] remove dependency on six (#30895)

---
 .../azure-containerregistry/tests/test_anon_access.py        | 5 ++---
 .../azure-containerregistry/tests/test_anon_access_async.py  | 5 ++---
 .../tests/test_container_registry_client.py                  | 5 ++---
 .../tests/test_container_registry_client_async.py            | 5 ++---
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/sdk/containerregistry/azure-containerregistry/tests/test_anon_access.py b/sdk/containerregistry/azure-containerregistry/tests/test_anon_access.py
index a124a2f3dff5..740924560344 100644
--- a/sdk/containerregistry/azure-containerregistry/tests/test_anon_access.py
+++ b/sdk/containerregistry/azure-containerregistry/tests/test_anon_access.py
@@ -4,7 +4,6 @@
 # Licensed under the MIT License.
 # ------------------------------------
 import pytest
-import six
 
 from azure.core.exceptions import ClientAuthenticationError
 from azure.core.paging import ItemPaged
@@ -38,7 +37,7 @@ def test_list_repository_names(self, containerregistry_anonregistry_endpoint):
             prev = None
             for repo in repositories:
                 count += 1
-                assert isinstance(repo, six.string_types)
+                assert isinstance(repo, str)
                 assert prev != repo
                 prev = repo
 
@@ -62,7 +61,7 @@ def test_list_repository_names_by_page(self, containerregistry_anonregistry_endp
             for page in repository_pages.by_page():
                 page_count = 0
                 for repo in page:
-                    assert isinstance(repo, six.string_types)
+                    assert isinstance(repo, str)
                     assert prev != repo
                     prev = repo
                     page_count += 1
diff --git a/sdk/containerregistry/azure-containerregistry/tests/test_anon_access_async.py b/sdk/containerregistry/azure-containerregistry/tests/test_anon_access_async.py
index 3f7560b9611c..ddec462dd5d4 100644
--- a/sdk/containerregistry/azure-containerregistry/tests/test_anon_access_async.py
+++ b/sdk/containerregistry/azure-containerregistry/tests/test_anon_access_async.py
@@ -4,7 +4,6 @@
 # Licensed under the MIT License.
 # ------------------------------------
 import pytest
-import six
 from azure.containerregistry import (
     RepositoryProperties,
     ArtifactManifestProperties,
@@ -38,7 +37,7 @@ async def test_list_repository_names(self, containerregistry_anonregistry_endpoi
             prev = None
             async for repo in repositories:
                 count += 1
-                assert isinstance(repo, six.string_types)
+                assert isinstance(repo, str)
                 assert prev != repo
                 prev = repo
 
@@ -62,7 +61,7 @@ async def test_list_repository_names_by_page(self, containerregistry_anonregistr
             async for page in repository_pages.by_page():
                 page_count = 0
                 async for repo in page:
-                    assert isinstance(repo, six.string_types)
+                    assert isinstance(repo, str)
                     assert prev != repo
                     prev = repo
                     page_count += 1
diff --git a/sdk/containerregistry/azure-containerregistry/tests/test_container_registry_client.py b/sdk/containerregistry/azure-containerregistry/tests/test_container_registry_client.py
index 1ee1d38b7e8b..f24816beabbc 100644
--- a/sdk/containerregistry/azure-containerregistry/tests/test_container_registry_client.py
+++ b/sdk/containerregistry/azure-containerregistry/tests/test_container_registry_client.py
@@ -5,7 +5,6 @@
 # ------------------------------------
 import os
 import pytest
-import six
 import hashlib
 import json
 from datetime import datetime
@@ -50,7 +49,7 @@ def test_list_repository_names(self, containerregistry_endpoint):
             prev = None
             for repo in repositories:
                 count += 1
-                assert isinstance(repo, six.string_types)
+                assert isinstance(repo, str)
                 assert prev != repo
                 prev = repo
 
@@ -69,7 +68,7 @@ def test_list_repository_names_by_page(self, containerregistry_endpoint):
             for page in repository_pages.by_page():
                 page_count = 0
                 for repo in page:
-                    assert isinstance(repo, six.string_types)
+                    assert isinstance(repo, str)
                     assert prev != repo
                     prev = repo
                     page_count += 1
diff --git a/sdk/containerregistry/azure-containerregistry/tests/test_container_registry_client_async.py b/sdk/containerregistry/azure-containerregistry/tests/test_container_registry_client_async.py
index c5f7ade87d63..a242a369ce19 100644
--- a/sdk/containerregistry/azure-containerregistry/tests/test_container_registry_client_async.py
+++ b/sdk/containerregistry/azure-containerregistry/tests/test_container_registry_client_async.py
@@ -5,7 +5,6 @@
 # ------------------------------------
 import os
 import pytest
-import six
 import hashlib
 import json
 from datetime import datetime
@@ -50,7 +49,7 @@ async def test_list_repository_names(self, containerregistry_endpoint):
             prev = None
             async for repo in repositories:
                 count += 1
-                assert isinstance(repo, six.string_types)
+                assert isinstance(repo, str)
                 assert prev != repo
                 prev = repo
 
@@ -69,7 +68,7 @@ async def test_list_repository_names_by_page(self, containerregistry_endpoint):
             async for page in repository_pages.by_page():
                 page_count = 0
                 async for repo in page:
-                    assert isinstance(repo, six.string_types)
+                    assert isinstance(repo, str)
                     assert prev != repo
                     prev = repo
                     page_count += 1