remove dependency on six (Azure#30895)

azure-sdk · Jun 27, 2023 · e016b9b · e016b9b
1 parent 0161163
commit e016b9b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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