openstack/swift
Code Issues Proposed changes

Merge "tests: Remove a couple more py2 code paths"

Browse Source
This commit is contained in:
Zuul
2025-02-20 18:28:30 +00:00
committed by Gerrit Code Review
parent 57f2732f9f 605c701235
commit 97cc335d54
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/__init__.py
View File

@@ -37,10 +37,6 @@ warnings.filterwarnings('ignore', message=(
import unittest 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 eventlet.green import socket
from swift.common.utils import readconf from swift.common.utils import readconf

6
test/functional/swift_test_client.py
View File

@@ -18,7 +18,7 @@ import io
import json import json
import os import os
import random import random
import sys import ssl
import socket import socket
import time import time
@@ -308,9 +308,7 @@ class Connection(object):
return json.loads(self.response.read()) return json.loads(self.response.read())
def http_connect(self): def http_connect(self):
if self.storage_scheme == 'https' and \ if self.storage_scheme == 'https' and self.insecure:
self.insecure and sys.version_info >= (2, 7, 9):
import ssl
self.connection = self.conn_class( self.connection = self.conn_class(
self.storage_netloc, self.storage_netloc,
context=ssl._create_unverified_context()) context=ssl._create_unverified_context())