From 605c70123594f1fb6141f3315e7399407457a282 Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Wed, 19 Feb 2025 18:00:00 -0800 Subject: [PATCH] tests: Remove a couple more py2 code paths Change-Id: Ia754021714a8ed3d5d6010a946c558552821fbe4 --- test/__init__.py | 4 ---- test/functional/swift_test_client.py | 6 ++---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/test/__init__.py b/test/__init__.py index e31ed458a4..ae17cdcb8d 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -37,10 +37,6 @@ warnings.filterwarnings('ignore', message=( import unittest -if sys.version_info < (3, 2): - unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp - unittest.TestCase.assertRegex = unittest.TestCase.assertRegexpMatches - from eventlet.green import socket from swift.common.utils import readconf diff --git a/test/functional/swift_test_client.py b/test/functional/swift_test_client.py index fd72c302e2..d59a2b61f8 100644 --- a/test/functional/swift_test_client.py +++ b/test/functional/swift_test_client.py @@ -18,7 +18,7 @@ import io import json import os import random -import sys +import ssl import socket import time @@ -308,9 +308,7 @@ class Connection(object): return json.loads(self.response.read()) def http_connect(self): - if self.storage_scheme == 'https' and \ - self.insecure and sys.version_info >= (2, 7, 9): - import ssl + if self.storage_scheme == 'https' and self.insecure: self.connection = self.conn_class( self.storage_netloc, context=ssl._create_unverified_context())