diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_backup_client.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_backup_client.py index a942dddcfb61..fd01784d818e 100644 --- a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_backup_client.py +++ b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_backup_client.py @@ -7,8 +7,7 @@ import pickle from typing import TYPE_CHECKING -from six import raise_from -from six.moves.urllib_parse import urlparse +from urllib.parse import urlparse from ._models import KeyVaultBackupResult from ._internal import KeyVaultClientBase, parse_folder_url @@ -73,13 +72,10 @@ def begin_backup(self, blob_storage_url, sas_token, **kwargs): try: job_id = _parse_status_url(status_url) except Exception as ex: # pylint: disable=broad-except - raise_from( - ValueError( - "The provided continuation_token is malformed. A valid token can be obtained from the " - + "operation poller's continuation_token() method" - ), - ex, - ) + raise ValueError( + "The provided continuation_token is malformed. A valid token can be obtained from the " + + "operation poller's continuation_token() method" + ) from ex pipeline_response = self._client.full_backup_status( vault_base_url=self._vault_url, job_id=job_id, cls=lambda pipeline_response, _, __: pipeline_response @@ -138,13 +134,10 @@ def begin_restore(self, folder_url, sas_token, **kwargs): try: job_id = _parse_status_url(status_url) except Exception as ex: # pylint: disable=broad-except - raise_from( - ValueError( - "The provided continuation_token is malformed. A valid token can be obtained from the " - + "operation poller's continuation_token() method" - ), - ex, - ) + raise ValueError( + "The provided continuation_token is malformed. A valid token can be obtained from the " + + "operation poller's continuation_token() method" + ) from ex pipeline_response = self._client.restore_status( vault_base_url=self._vault_url, job_id=job_id, cls=lambda pipeline_response, _, __: pipeline_response diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_enums.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_enums.py index 8999a64ed9ec..ce21fb4110ac 100644 --- a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_enums.py +++ b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_enums.py @@ -3,21 +3,18 @@ # Licensed under the MIT License. # ------------------------------------ from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -# pylint:skip-file (avoids crash due to six.with_metaclass https://github.com/PyCQA/astroid/issues/713) - -class KeyVaultRoleScope(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class KeyVaultRoleScope(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Collection of well known role scopes. This list is not exhaustive.""" GLOBAL = "/" #: use this if you want role assignments to apply to everything on the resource KEYS = "/keys" #: use this if you want role assignments to apply to all keys -class KeyVaultDataAction(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class KeyVaultDataAction(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Supported permissions for data actions.""" #: Read HSM key metadata. diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/__init__.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/__init__.py index a0536ae8029e..fbf735cf14fb 100644 --- a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/__init__.py +++ b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/__init__.py @@ -4,7 +4,7 @@ # ------------------------------------ from collections import namedtuple -from six.moves.urllib_parse import urlparse +from urllib.parse import urlparse from .challenge_auth_policy import ChallengeAuthPolicy from .client_base import KeyVaultClientBase diff --git a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/client_base.py b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/client_base.py index c396e2332f21..84e913a8c0df 100644 --- a/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/client_base.py +++ b/sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/client_base.py @@ -2,10 +2,9 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. # ------------------------------------ -# pylint:skip-file (avoids crash due to six.with_metaclass https://github.com/PyCQA/astroid/issues/713) + from typing import TYPE_CHECKING from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta from azure.core.pipeline.policies import HttpLoggingPolicy @@ -20,7 +19,7 @@ from azure.core.credentials import TokenCredential -class ApiVersion(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ApiVersion(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Key Vault API versions supported by this package""" #: this is the default version diff --git a/sdk/keyvault/azure-keyvault-administration/setup.py b/sdk/keyvault/azure-keyvault-administration/setup.py index ec9e072a0f88..ee818e4092a5 100644 --- a/sdk/keyvault/azure-keyvault-administration/setup.py +++ b/sdk/keyvault/azure-keyvault-administration/setup.py @@ -70,7 +70,6 @@ "azure-common~=1.1", "azure-core<2.0.0,>=1.24.0", "isodate>=0.6.1", - "six>=1.11.0", "typing-extensions>=4.0.1", ], ) diff --git a/sdk/keyvault/azure-keyvault-administration/tests/_shared/helpers.py b/sdk/keyvault/azure-keyvault-administration/tests/_shared/helpers.py index 8df36215388e..bccc64ed773d 100644 --- a/sdk/keyvault/azure-keyvault-administration/tests/_shared/helpers.py +++ b/sdk/keyvault/azure-keyvault-administration/tests/_shared/helpers.py @@ -3,7 +3,7 @@ # Licensed under the MIT License. # ------------------------------------ import json -import six +from urllib import parse try: from unittest import mock @@ -47,7 +47,7 @@ def add_discrepancy(name, expected, actual): if self.url_substring and self.url_substring not in request.url: add_discrepancy("url substring", self.url_substring, request.url) - parsed = six.moves.urllib_parse.urlparse(request.url) + parsed = parse.urlparse(request.url) if self.authority and parsed.netloc != self.authority: add_discrepancy("authority", self.authority, parsed.netloc) diff --git a/sdk/keyvault/azure-keyvault-administration/tests/_shared/json_attribute_matcher.py b/sdk/keyvault/azure-keyvault-administration/tests/_shared/json_attribute_matcher.py index bf79ad588082..e0514b612188 100644 --- a/sdk/keyvault/azure-keyvault-administration/tests/_shared/json_attribute_matcher.py +++ b/sdk/keyvault/azure-keyvault-administration/tests/_shared/json_attribute_matcher.py @@ -4,8 +4,6 @@ # ------------------------------------ import json -import six - _has_json_body = lambda req: req.body and "json" in req.headers.get("Content-Type", "") @@ -13,6 +11,6 @@ def json_attribute_matcher(r1, r2): """Tests whether two vcr.py requests have JSON content with identical attributes (ignoring values).""" if _has_json_body(r1) and _has_json_body(r2): - c1 = json.loads(six.ensure_str(r1.body)) - c2 = json.loads(six.ensure_str(r2.body)) + c1 = json.loads(str(r1.body)) + c2 = json.loads(str(r2.body)) assert sorted(c1.keys()) == sorted(c2.keys()) diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_enums.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_enums.py index 866fcb15f916..6913db4755d7 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_enums.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_enums.py @@ -2,28 +2,29 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. # ------------------------------------ -# pylint:skip-file (avoids crash due to six.with_metaclass https://github.com/PyCQA/astroid/issues/713) + +# pylint: disable=enum-must-be-uppercase + from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class CertificatePolicyAction(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class CertificatePolicyAction(str, Enum, metaclass=CaseInsensitiveEnumMeta): """The supported action types for the lifetime of a certificate""" email_contacts = "EmailContacts" auto_renew = "AutoRenew" -class CertificateContentType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class CertificateContentType(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Content type of the secrets as specified in Certificate Policy""" pkcs12 = "application/x-pkcs12" pem = "application/x-pem-file" -class KeyUsageType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class KeyUsageType(str, Enum, metaclass=CaseInsensitiveEnumMeta): """The supported types of key usages""" digital_signature = "digitalSignature" @@ -37,7 +38,7 @@ class KeyUsageType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): decipher_only = "decipherOnly" -class KeyType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class KeyType(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Supported key types""" ec = "EC" #: Elliptic Curve @@ -55,7 +56,7 @@ def _missing_(cls, value): raise ValueError(f"{value} is not a valid KeyType") -class KeyCurveName(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class KeyCurveName(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Supported elliptic curves""" p_256 = "P-256" #: The NIST P-256 elliptic curve, AKA SECG curve SECP256R1. @@ -64,7 +65,7 @@ class KeyCurveName(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): p_256_k = "P-256K" #: The SECG SECP256K1 elliptic curve. -class WellKnownIssuerNames(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class WellKnownIssuerNames(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Collection of well-known issuer names""" self = "Self" #: Use this issuer for a self-signed certificate diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py index f507131f4cad..b6262d1e77e0 100644 --- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py +++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/client_base.py @@ -2,10 +2,8 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. # ------------------------------------ -# pylint:skip-file (avoids crash due to six.with_metaclass https://github.com/PyCQA/astroid/issues/713) from typing import TYPE_CHECKING from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta from azure.core.pipeline.policies import HttpLoggingPolicy @@ -20,7 +18,7 @@ from azure.core.credentials import TokenCredential -class ApiVersion(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ApiVersion(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Key Vault API versions supported by this package""" #: this is the default version diff --git a/sdk/keyvault/azure-keyvault-certificates/setup.py b/sdk/keyvault/azure-keyvault-certificates/setup.py index 4476496d6e4e..32c9bdc8fc98 100644 --- a/sdk/keyvault/azure-keyvault-certificates/setup.py +++ b/sdk/keyvault/azure-keyvault-certificates/setup.py @@ -70,7 +70,6 @@ "azure-common~=1.1", "azure-core<2.0.0,>=1.24.0", "isodate>=0.6.1", - "six>=1.11.0", "typing-extensions>=4.0.1", ], ) diff --git a/sdk/keyvault/azure-keyvault-certificates/tests/_shared/helpers.py b/sdk/keyvault/azure-keyvault-certificates/tests/_shared/helpers.py index 8df36215388e..bccc64ed773d 100644 --- a/sdk/keyvault/azure-keyvault-certificates/tests/_shared/helpers.py +++ b/sdk/keyvault/azure-keyvault-certificates/tests/_shared/helpers.py @@ -3,7 +3,7 @@ # Licensed under the MIT License. # ------------------------------------ import json -import six +from urllib import parse try: from unittest import mock @@ -47,7 +47,7 @@ def add_discrepancy(name, expected, actual): if self.url_substring and self.url_substring not in request.url: add_discrepancy("url substring", self.url_substring, request.url) - parsed = six.moves.urllib_parse.urlparse(request.url) + parsed = parse.urlparse(request.url) if self.authority and parsed.netloc != self.authority: add_discrepancy("authority", self.authority, parsed.netloc) diff --git a/sdk/keyvault/azure-keyvault-certificates/tests/_shared/json_attribute_matcher.py b/sdk/keyvault/azure-keyvault-certificates/tests/_shared/json_attribute_matcher.py index bf79ad588082..e0514b612188 100644 --- a/sdk/keyvault/azure-keyvault-certificates/tests/_shared/json_attribute_matcher.py +++ b/sdk/keyvault/azure-keyvault-certificates/tests/_shared/json_attribute_matcher.py @@ -4,8 +4,6 @@ # ------------------------------------ import json -import six - _has_json_body = lambda req: req.body and "json" in req.headers.get("Content-Type", "") @@ -13,6 +11,6 @@ def json_attribute_matcher(r1, r2): """Tests whether two vcr.py requests have JSON content with identical attributes (ignoring values).""" if _has_json_body(r1) and _has_json_body(r2): - c1 = json.loads(six.ensure_str(r1.body)) - c2 = json.loads(six.ensure_str(r2.body)) + c1 = json.loads(str(r1.body)) + c2 = json.loads(str(r2.body)) assert sorted(c1.keys()) == sorted(c2.keys()) diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_enums.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_enums.py index bcc3cc106015..d9a07ae8e786 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_enums.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_enums.py @@ -2,14 +2,15 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. # ------------------------------------ -# pylint:skip-file (avoids crash due to six.with_metaclass https://github.com/PyCQA/astroid/issues/713) + +# pylint: disable=enum-must-be-uppercase + from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta -class KeyCurveName(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class KeyCurveName(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Supported elliptic curves""" p_256 = "P-256" #: The NIST P-256 elliptic curve, AKA SECG curve SECP256R1. @@ -18,7 +19,7 @@ class KeyCurveName(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): p_256_k = "P-256K" #: The SECG SECP256K1 elliptic curve. -class KeyExportEncryptionAlgorithm(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class KeyExportEncryptionAlgorithm(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Supported algorithms for protecting exported key material""" ckm_rsa_aes_key_wrap = "CKM_RSA_AES_KEY_WRAP" @@ -26,7 +27,7 @@ class KeyExportEncryptionAlgorithm(with_metaclass(CaseInsensitiveEnumMeta, str, rsa_aes_key_wrap_384 = "RSA_AES_KEY_WRAP_384" -class KeyOperation(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class KeyOperation(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Supported key operations""" encrypt = "encrypt" @@ -39,14 +40,14 @@ class KeyOperation(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): export = "export" -class KeyRotationPolicyAction(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class KeyRotationPolicyAction(str, Enum, metaclass=CaseInsensitiveEnumMeta): """The action that will be executed in a key rotation policy""" rotate = "Rotate" #: Rotate the key based on the key policy. notify = "Notify" #: Trigger Event Grid events. -class KeyType(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class KeyType(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Supported key types""" ec = "EC" #: Elliptic Curve diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py index f507131f4cad..b6262d1e77e0 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/client_base.py @@ -2,10 +2,8 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. # ------------------------------------ -# pylint:skip-file (avoids crash due to six.with_metaclass https://github.com/PyCQA/astroid/issues/713) from typing import TYPE_CHECKING from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta from azure.core.pipeline.policies import HttpLoggingPolicy @@ -20,7 +18,7 @@ from azure.core.credentials import TokenCredential -class ApiVersion(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ApiVersion(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Key Vault API versions supported by this package""" #: this is the default version diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_client.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_client.py index f6e874d98e26..7f670975b2e9 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_client.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_client.py @@ -5,7 +5,6 @@ import logging from typing import TYPE_CHECKING, cast -import six from azure.core.exceptions import HttpResponseError from azure.core.tracing.decorator import distributed_trace @@ -119,7 +118,7 @@ def __init__(self, key, credential, **kwargs): if key.properties._attributes: # pylint:disable=protected-access self._not_before = key.properties.not_before self._expires_on = key.properties.expires_on - elif isinstance(key, six.string_types): + elif isinstance(key, str): self._key = None self._key_id = parse_key_vault_id(key) if self._key_id.version is None: @@ -135,7 +134,7 @@ def __init__(self, key, credential, **kwargs): self._local_provider = get_local_cryptography_provider(cast(JsonWebKey, self._key)) self._initialized = True except Exception as ex: # pylint:disable=broad-except - six.raise_from(ValueError("The provided jwk is not valid for local cryptography"), ex) + raise ValueError("The provided jwk is not valid for local cryptography") from ex else: self._local_provider = NoLocalCryptography() self._initialized = False diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_internal/key.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_internal/key.py index 2a04602ba8f1..18665efeecce 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_internal/key.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_internal/key.py @@ -4,7 +4,6 @@ # ------------------------------------ from abc import ABCMeta, abstractmethod -from six import with_metaclass from .algorithm import Algorithm try: @@ -16,7 +15,7 @@ # pylint:disable=unused-import from typing import Any, FrozenSet -class Key(with_metaclass(ABCMeta, object)): +class Key(object, metaclass=ABCMeta): _supported_encryption_algorithms = frozenset([]) # type: FrozenSet[Any] _supported_key_wrap_algorithms = frozenset([]) # type: FrozenSet[Any] _supported_signature_algorithms = frozenset([]) # type: FrozenSet[Any] diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_internal/transform.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_internal/transform.py index 039aece0f464..3a24f7ab1a7f 100644 --- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_internal/transform.py +++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_internal/transform.py @@ -4,10 +4,9 @@ # ------------------------------------ from abc import ABCMeta, abstractmethod -from six import with_metaclass -class CryptoTransform(with_metaclass(ABCMeta, object)): +class CryptoTransform(object, metaclass=ABCMeta): def __init__(self, key): self._key = key @@ -36,13 +35,13 @@ def finalize(self): raise NotImplementedError() -class AuthenticatedCryptoTransform(with_metaclass(ABCMeta, object)): +class AuthenticatedCryptoTransform(object, metaclass=ABCMeta): @abstractmethod def tag(self): raise NotImplementedError() -class SignatureTransform(with_metaclass(ABCMeta, object)): +class SignatureTransform(object, metaclass=ABCMeta): @abstractmethod def sign(self, digest): raise NotImplementedError() @@ -52,7 +51,7 @@ def verify(self, digest, signature): raise NotImplementedError() -class DigestTransform(with_metaclass(ABCMeta, object)): +class DigestTransform(object, metaclass=ABCMeta): @abstractmethod def update(self, data): raise NotImplementedError() diff --git a/sdk/keyvault/azure-keyvault-keys/setup.py b/sdk/keyvault/azure-keyvault-keys/setup.py index 074b236208f1..386822e41d47 100644 --- a/sdk/keyvault/azure-keyvault-keys/setup.py +++ b/sdk/keyvault/azure-keyvault-keys/setup.py @@ -70,7 +70,6 @@ "azure-core<2.0.0,>=1.24.0", "cryptography>=2.1.4", "isodate>=0.6.1", - "six>=1.12.0", "typing-extensions>=4.0.1", ], ) diff --git a/sdk/keyvault/azure-keyvault-keys/tests/_shared/helpers.py b/sdk/keyvault/azure-keyvault-keys/tests/_shared/helpers.py index 8df36215388e..bccc64ed773d 100644 --- a/sdk/keyvault/azure-keyvault-keys/tests/_shared/helpers.py +++ b/sdk/keyvault/azure-keyvault-keys/tests/_shared/helpers.py @@ -3,7 +3,7 @@ # Licensed under the MIT License. # ------------------------------------ import json -import six +from urllib import parse try: from unittest import mock @@ -47,7 +47,7 @@ def add_discrepancy(name, expected, actual): if self.url_substring and self.url_substring not in request.url: add_discrepancy("url substring", self.url_substring, request.url) - parsed = six.moves.urllib_parse.urlparse(request.url) + parsed = parse.urlparse(request.url) if self.authority and parsed.netloc != self.authority: add_discrepancy("authority", self.authority, parsed.netloc) diff --git a/sdk/keyvault/azure-keyvault-keys/tests/_shared/json_attribute_matcher.py b/sdk/keyvault/azure-keyvault-keys/tests/_shared/json_attribute_matcher.py index bf79ad588082..e0514b612188 100644 --- a/sdk/keyvault/azure-keyvault-keys/tests/_shared/json_attribute_matcher.py +++ b/sdk/keyvault/azure-keyvault-keys/tests/_shared/json_attribute_matcher.py @@ -4,8 +4,6 @@ # ------------------------------------ import json -import six - _has_json_body = lambda req: req.body and "json" in req.headers.get("Content-Type", "") @@ -13,6 +11,6 @@ def json_attribute_matcher(r1, r2): """Tests whether two vcr.py requests have JSON content with identical attributes (ignoring values).""" if _has_json_body(r1) and _has_json_body(r2): - c1 = json.loads(six.ensure_str(r1.body)) - c2 = json.loads(six.ensure_str(r2.body)) + c1 = json.loads(str(r1.body)) + c2 = json.loads(str(r2.body)) assert sorted(c1.keys()) == sorted(c2.keys()) diff --git a/sdk/keyvault/azure-keyvault-keys/tests/test_key_client.py b/sdk/keyvault/azure-keyvault-keys/tests/test_key_client.py index aa4db2596391..484f74ea0690 100644 --- a/sdk/keyvault/azure-keyvault-keys/tests/test_key_client.py +++ b/sdk/keyvault/azure-keyvault-keys/tests/test_key_client.py @@ -25,7 +25,6 @@ from azure.keyvault.keys._generated.v7_3.models import KeyRotationPolicy as _KeyRotationPolicy from dateutil import parser as date_parse from devtools_testutils import recorded_by_proxy, set_bodiless_matcher -from six import byte2int from _shared.test_case import KeyVaultTestCase from _test_case import KeysClientPreparer, get_attestation_token, get_decorator, get_release_policy, is_public_cloud @@ -254,7 +253,7 @@ def test_rsa_public_exponent(self, client, **kwargs): key_name = self.get_resource_name("rsa-key") key = self._create_rsa_key(client, key_name, hardware_protected=True, public_exponent=17) - public_exponent = byte2int(key.key.e) + public_exponent = key.key.e[0] assert public_exponent == 17 @pytest.mark.parametrize("api_version,is_hsm",all_api_versions) diff --git a/sdk/keyvault/azure-keyvault-keys/tests/test_keys_async.py b/sdk/keyvault/azure-keyvault-keys/tests/test_keys_async.py index 46dd438a25c5..c0819f971aea 100644 --- a/sdk/keyvault/azure-keyvault-keys/tests/test_keys_async.py +++ b/sdk/keyvault/azure-keyvault-keys/tests/test_keys_async.py @@ -22,7 +22,6 @@ ) from azure.keyvault.keys.aio import KeyClient import pytest -from six import byte2int from _shared.test_case_async import KeyVaultTestCase from _async_test_case import get_attestation_token, get_decorator, get_release_policy, is_public_cloud, AsyncKeysClientPreparer @@ -250,7 +249,7 @@ async def test_rsa_public_exponent(self, client, **kwargs): key_name = self.get_resource_name("rsa-key") key = await self._create_rsa_key(client, key_name, hardware_protected=True, public_exponent=17) - public_exponent = byte2int(key.key.e) + public_exponent = key.key.e[0] assert public_exponent == 17 @pytest.mark.asyncio diff --git a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py index f507131f4cad..b6262d1e77e0 100644 --- a/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py +++ b/sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/client_base.py @@ -2,10 +2,8 @@ # Copyright (c) Microsoft Corporation. # Licensed under the MIT License. # ------------------------------------ -# pylint:skip-file (avoids crash due to six.with_metaclass https://github.com/PyCQA/astroid/issues/713) from typing import TYPE_CHECKING from enum import Enum -from six import with_metaclass from azure.core import CaseInsensitiveEnumMeta from azure.core.pipeline.policies import HttpLoggingPolicy @@ -20,7 +18,7 @@ from azure.core.credentials import TokenCredential -class ApiVersion(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)): +class ApiVersion(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Key Vault API versions supported by this package""" #: this is the default version diff --git a/sdk/keyvault/azure-keyvault-secrets/setup.py b/sdk/keyvault/azure-keyvault-secrets/setup.py index 37f9c4245b8e..d6dd72ed23b3 100644 --- a/sdk/keyvault/azure-keyvault-secrets/setup.py +++ b/sdk/keyvault/azure-keyvault-secrets/setup.py @@ -70,7 +70,6 @@ "azure-common~=1.1", "azure-core<2.0.0,>=1.24.0", "isodate>=0.6.1", - "six>=1.11.0", "typing-extensions>=4.0.1", ], ) diff --git a/sdk/keyvault/azure-keyvault-secrets/tests/_shared/helpers.py b/sdk/keyvault/azure-keyvault-secrets/tests/_shared/helpers.py index 8df36215388e..bccc64ed773d 100644 --- a/sdk/keyvault/azure-keyvault-secrets/tests/_shared/helpers.py +++ b/sdk/keyvault/azure-keyvault-secrets/tests/_shared/helpers.py @@ -3,7 +3,7 @@ # Licensed under the MIT License. # ------------------------------------ import json -import six +from urllib import parse try: from unittest import mock @@ -47,7 +47,7 @@ def add_discrepancy(name, expected, actual): if self.url_substring and self.url_substring not in request.url: add_discrepancy("url substring", self.url_substring, request.url) - parsed = six.moves.urllib_parse.urlparse(request.url) + parsed = parse.urlparse(request.url) if self.authority and parsed.netloc != self.authority: add_discrepancy("authority", self.authority, parsed.netloc) diff --git a/sdk/keyvault/azure-keyvault-secrets/tests/_shared/json_attribute_matcher.py b/sdk/keyvault/azure-keyvault-secrets/tests/_shared/json_attribute_matcher.py index bf79ad588082..e0514b612188 100644 --- a/sdk/keyvault/azure-keyvault-secrets/tests/_shared/json_attribute_matcher.py +++ b/sdk/keyvault/azure-keyvault-secrets/tests/_shared/json_attribute_matcher.py @@ -4,8 +4,6 @@ # ------------------------------------ import json -import six - _has_json_body = lambda req: req.body and "json" in req.headers.get("Content-Type", "") @@ -13,6 +11,6 @@ def json_attribute_matcher(r1, r2): """Tests whether two vcr.py requests have JSON content with identical attributes (ignoring values).""" if _has_json_body(r1) and _has_json_body(r2): - c1 = json.loads(six.ensure_str(r1.body)) - c2 = json.loads(six.ensure_str(r2.body)) + c1 = json.loads(str(r1.body)) + c2 = json.loads(str(r2.body)) assert sorted(c1.keys()) == sorted(c2.keys())