From 3f3f5be9bb39f5d51caf0eae04a84d708061423b Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Mon, 25 Sep 2023 15:55:47 -0700 Subject: [PATCH] tests: boto is always <3.0 Otherwise, it'd be boto3. Change-Id: I2961740fd4f3e914675083331f2465591d63b755 --- test/functional/s3api/__init__.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/test/functional/s3api/__init__.py b/test/functional/s3api/__init__.py index a744e96e6d..dbb32276fe 100644 --- a/test/functional/s3api/__init__.py +++ b/test/functional/s3api/__init__.py @@ -20,8 +20,6 @@ import logging from unittest import SkipTest import os -import boto -from distutils.version import StrictVersion import test.functional as tf from test.functional.s3api.s3_test_client import ( @@ -112,9 +110,8 @@ class S3ApiBaseBoto3(S3ApiBase): def skip_boto2_sort_header_bug(m): def wrapped(self, *args, **kwargs): - if (os.environ.get('S3_USE_SIGV4') == "True" and - StrictVersion(boto.__version__) < StrictVersion('3.0')): - # boto 2 doesn't sort headers properly; see + if os.environ.get('S3_USE_SIGV4') == "True": + # boto doesn't sort headers for v4 sigs properly; see # https://github.com/boto/boto/pull/3032 # or https://github.com/boto/boto/pull/3176 # or https://github.com/boto/boto/pull/3751