From 08e33aae40490628369b9495d97303f0f40b1f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Kul=C3=ADk?= Date: Wed, 3 Dec 2025 12:56:43 +0100 Subject: [PATCH] always use the vendored copy of six --- src/oci/base_client.py | 2 +- .../transfer/internal/download/DownloadManager.py | 2 +- .../object_storage/transfer/internal/download/DownloadThread.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/oci/base_client.py b/src/oci/base_client.py index 72f8a33bc3..8b9a767fd9 100644 --- a/src/oci/base_client.py +++ b/src/oci/base_client.py @@ -24,7 +24,7 @@ from dateutil.parser import parse from dateutil import tz import functools -from six.moves.http_client import HTTPResponse +from ._vendor.six.moves.http_client import HTTPResponse from . import constants, exceptions, regions, retry from .auth import signers diff --git a/src/oci/object_storage/transfer/internal/download/DownloadManager.py b/src/oci/object_storage/transfer/internal/download/DownloadManager.py index 7fa3e20755..980bad6e13 100644 --- a/src/oci/object_storage/transfer/internal/download/DownloadManager.py +++ b/src/oci/object_storage/transfer/internal/download/DownloadManager.py @@ -3,7 +3,6 @@ # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. import io -import six import math import time import warnings @@ -11,6 +10,7 @@ from oci.object_storage.transfer.internal.download.DownloadThread import (ParallelDownloader, SequentialDownloader, DownloadState) from oci.exceptions import (ResumableDownloadException, DownloadTerminated, DownloadFailedIncorrectDownloadSize) +from oci._vendor import six class DownloadManager(object): diff --git a/src/oci/object_storage/transfer/internal/download/DownloadThread.py b/src/oci/object_storage/transfer/internal/download/DownloadThread.py index 7662eb7d5b..52ef8a7668 100644 --- a/src/oci/object_storage/transfer/internal/download/DownloadThread.py +++ b/src/oci/object_storage/transfer/internal/download/DownloadThread.py @@ -2,11 +2,11 @@ # Copyright (c) 2016, 2025, Oracle and/or its affiliates. All rights reserved. # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -import six import time import multiprocessing from enum import Enum from oci.exceptions import DownloadTerminated, DownloadFailedIncorrectDownloadSize +from oci._vendor import six class DownloadState(Enum):