From a161c4af5e75ad857d344abf04213c615e8834a5 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 19 Feb 2024 00:59:38 +0900 Subject: [PATCH] Remove six again There are still a few usages of six left. This removes these to drop implicit dependency on six completely. Change-Id: Ie88321ed03f7fe14ed603a1523c626f196949f21 --- keystonemiddleware/auth_token/_memcache_crypt.py | 2 +- .../tests/unit/test_external_oauth2_token_middleware.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/keystonemiddleware/auth_token/_memcache_crypt.py b/keystonemiddleware/auth_token/_memcache_crypt.py index 17930a88..8645004c 100644 --- a/keystonemiddleware/auth_token/_memcache_crypt.py +++ b/keystonemiddleware/auth_token/_memcache_crypt.py @@ -140,7 +140,7 @@ def encrypt_data(key, data): # AES algorithm uses block size of 16 bytes = 128 bits, defined in # algorithms.AES.block_size. Previously, we manually padded this using - # six.int2byte(padding) * padding. Using ``cryptography``, we will + # bytes((padding,)) * padding. Using ``cryptography``, we will # analogously use hazmat.primitives.padding to pad it to # the 128-bit block size. padder = padding.PKCS7(algorithms.AES.block_size).padder() diff --git a/keystonemiddleware/tests/unit/test_external_oauth2_token_middleware.py b/keystonemiddleware/tests/unit/test_external_oauth2_token_middleware.py index c67f79b7..d23fedb7 100644 --- a/keystonemiddleware/tests/unit/test_external_oauth2_token_middleware.py +++ b/keystonemiddleware/tests/unit/test_external_oauth2_token_middleware.py @@ -15,6 +15,7 @@ import base64 import copy import hashlib +from http import HTTPStatus import jwt.utils import logging import ssl @@ -26,8 +27,6 @@ import webob.dec import fixtures from oslo_config import cfg -import six -from six.moves import http_client import testresources from keystoneauth1 import exceptions as ksa_exceptions @@ -282,7 +281,7 @@ class BaseExternalOauth2TokenMiddlewareTest(base.BaseAuthTokenTestCase, self.fake_app(expected_env=self.expected_env), self.conf) def call(self, middleware, method='GET', path='/', headers=None, - expected_status=http_client.OK, + expected_status=HTTPStatus.OK, expected_body_string=None, **kwargs): req = webob.Request.blank(path, **kwargs) req.method = method @@ -293,7 +292,7 @@ class BaseExternalOauth2TokenMiddlewareTest(base.BaseAuthTokenTestCase, resp = req.get_response(middleware) self.assertEqual(expected_status, resp.status_int) if expected_body_string: - self.assertIn(expected_body_string, six.text_type(resp.body)) + self.assertIn(expected_body_string, str(resp.body)) resp.request = req return resp