Skip to content

always use the vendored copy of six #810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kulikjak wants to merge 1 commit into
base: master
Choose a base branch
from
Open

always use the vendored copy of six #810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/oci/base_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/oci/object_storage/transfer/internal/download/DownloadManager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
# 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
from multiprocessing.dummy import Pool
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):
Expand Down
2 changes: 1 addition & 1 deletion src/oci/object_storage/transfer/internal/download/DownloadThread.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down