diff --git a/baidubce/auth/bce_v1_signer.py b/baidubce/auth/bce_v1_signer.py index 35c45579..62937e85 100644 --- a/baidubce/auth/bce_v1_signer.py +++ b/baidubce/auth/bce_v1_signer.py @@ -13,7 +13,6 @@ """ This module provides authentication functions for bce services. """ -from __future__ import absolute_import import hashlib import hmac import logging diff --git a/baidubce/bce_base_client.py b/baidubce/bce_base_client.py index 6905d0ff..02976da4 100644 --- a/baidubce/bce_base_client.py +++ b/baidubce/bce_base_client.py @@ -13,9 +13,7 @@ """ This module provide base class for BCE service clients. """ -from __future__ import absolute_import import copy -from builtins import str, bytes import baidubce from baidubce import bce_client_configuration diff --git a/baidubce/bce_client_configuration.py b/baidubce/bce_client_configuration.py index 8d4d834b..c3e01d3c 100644 --- a/baidubce/bce_client_configuration.py +++ b/baidubce/bce_client_configuration.py @@ -14,9 +14,6 @@ This module defines a common configuration class for BCE. """ -from future.utils import iteritems -from builtins import str -from builtins import bytes import baidubce.protocol import baidubce.region from baidubce.retry.retry_policy import BackOffRetryPolicy @@ -70,7 +67,7 @@ def merge_non_none_values(self, other): :param other: :return: """ - for k, v in iteritems(other.__dict__): + for k, v in other.__dict__.items(): if v is not None: self.__dict__[k] = v diff --git a/baidubce/bce_response.py b/baidubce/bce_response.py index d55447b0..1db49dd3 100644 --- a/baidubce/bce_response.py +++ b/baidubce/bce_response.py @@ -13,9 +13,6 @@ """ This module provides a general response class for BCE services. """ -from future.utils import iteritems -from builtins import str -from builtins import bytes from baidubce import utils from baidubce import compat from baidubce.http import http_headers @@ -34,7 +31,7 @@ def set_metadata_from_headers(self, headers): :param headers: :return: """ - for k, v in iteritems(headers): + for k, v in headers.items(): if k.startswith(compat.convert_to_string(http_headers.BCE_PREFIX)): k = 'bce_' + k[len(compat.convert_to_string(http_headers.BCE_PREFIX)):] k = utils.pythonize_name(k.replace('-', '_')) @@ -48,7 +45,7 @@ def set_metadata_from_headers_no_underlined(self, headers): :param headers: :return: """ - for k, v in iteritems(headers): + for k, v in headers.items(): if k.lower() == compat.convert_to_string(http_headers.ETAG.lower()): v = v.strip('"') setattr(self.metadata, k, v) diff --git a/baidubce/http/bce_http_client.py b/baidubce/http/bce_http_client.py index 7c5e4bf8..fb1e881b 100644 --- a/baidubce/http/bce_http_client.py +++ b/baidubce/http/bce_http_client.py @@ -13,8 +13,6 @@ """ This module provide http request function for bce services. """ -from future.utils import iteritems, iterkeys, itervalues -from builtins import str, bytes import logging import http.client import sys @@ -77,7 +75,7 @@ def _send_http_request(conn, http_method, uri, headers, body, send_buf_size): uri = compat.convert_to_string(uri) conn.putrequest(http_method, uri, skip_host=True, skip_accept_encoding=True) - for k, v in iteritems(headers): + for k, v in headers.items(): k = utils.convert_to_standard_string(k) v = utils.convert_to_standard_string(v) conn.putheader(k, v) @@ -110,7 +108,7 @@ def check_headers(headers): :param headers: :return: """ - for k, v in iteritems(headers): + for k, v in headers.items(): if isinstance(v, (bytes, str)) and \ b'\n' in compat.convert_to_bytes(v): raise BceClientError(r'There should not be any "\n" in header[%s]:%s' % (k, v)) diff --git a/baidubce/services/bcc/bcc_client.py b/baidubce/services/bcc/bcc_client.py index fd093563..66ffa9ce 100644 --- a/baidubce/services/bcc/bcc_client.py +++ b/baidubce/services/bcc/bcc_client.py @@ -15,8 +15,6 @@ This module provides a client class for BCC. """ -from __future__ import unicode_literals - import copy import json import logging diff --git a/baidubce/services/bos/bos_client.py b/baidubce/services/bos/bos_client.py index f7591142..c5bbc0b2 100644 --- a/baidubce/services/bos/bos_client.py +++ b/baidubce/services/bos/bos_client.py @@ -22,9 +22,6 @@ import logging import shutil import struct -from builtins import str -from builtins import bytes -from future.utils import iteritems, iterkeys, itervalues from concurrent.futures import ThreadPoolExecutor, wait, ALL_COMPLETED, FIRST_COMPLETED import threading import functools @@ -174,7 +171,7 @@ def get_bucket_acl(self, bucket_name, config=None): @staticmethod def _dump_acl_object(acl): result = {} - for k, v in iteritems(acl.__dict__): + for k, v in acl.__dict__.items(): if not k.startswith('_'): result[k] = v return result @@ -2851,7 +2848,7 @@ def _prepare_object_headers( meta_data_set = set() if not isinstance(user_metadata, dict): raise TypeError('user_metadata should be of type dict.') - for k, v in iteritems(user_metadata): + for k, v in user_metadata.items(): meta_data_set.add(k.lower()) k = utils.convert_to_standard_string(k) v = utils.convert_to_standard_string(v) @@ -2911,7 +2908,7 @@ def _get_user_header(headers, user_headers, is_copy=False): http_headers.BCE_COPY_SOURCE_IF_UNMODIFIED_SINCE, http_headers.BCE_COPY_SOURCE_IF_MODIFIED_SINCE])) - for k, v in iteritems(user_headers): + for k, v in user_headers.items(): k = utils.convert_to_standard_string(k) if k != http_headers.BOS_OBJECT_EXPIRES: v = utils.convert_to_standard_string(v) diff --git a/baidubce/services/cert/cert_client.py b/baidubce/services/cert/cert_client.py index 9b005b43..1cfe55fd 100644 --- a/baidubce/services/cert/cert_client.py +++ b/baidubce/services/cert/cert_client.py @@ -14,8 +14,6 @@ This module provides a client class for CERT. """ -from __future__ import unicode_literals - import copy import json import logging diff --git a/baidubce/services/esg/esg_client.py b/baidubce/services/esg/esg_client.py index e0827f42..fcedd7ed 100644 --- a/baidubce/services/esg/esg_client.py +++ b/baidubce/services/esg/esg_client.py @@ -13,7 +13,6 @@ """ This module provides a client class for esg. """ -from __future__ import unicode_literals import copy import json diff --git a/baidubce/services/iam/iam_client.py b/baidubce/services/iam/iam_client.py index ee804ca7..d2ce54ec 100644 --- a/baidubce/services/iam/iam_client.py +++ b/baidubce/services/iam/iam_client.py @@ -18,8 +18,6 @@ import json import logging -from future.utils import iteritems - from baidubce.auth import bce_v1_signer from baidubce.bce_base_client import BceBaseClient from baidubce.http import bce_http_client diff --git a/baidubce/services/rds/rds_client.py b/baidubce/services/rds/rds_client.py index 71e058b6..a055986e 100644 --- a/baidubce/services/rds/rds_client.py +++ b/baidubce/services/rds/rds_client.py @@ -14,8 +14,6 @@ This module provides a client class for RDS. """ -from __future__ import unicode_literals - import copy import json import logging diff --git a/baidubce/services/scs/scs_client.py b/baidubce/services/scs/scs_client.py index c4c1631a..c20d5937 100644 --- a/baidubce/services/scs/scs_client.py +++ b/baidubce/services/scs/scs_client.py @@ -16,7 +16,6 @@ """ This module provides a client class for SCS. """ -from __future__ import unicode_literals import copy import json diff --git a/baidubce/services/sts/sts_client.py b/baidubce/services/sts/sts_client.py index 9aba0e3e..22ee710b 100644 --- a/baidubce/services/sts/sts_client.py +++ b/baidubce/services/sts/sts_client.py @@ -14,7 +14,6 @@ This module provides a client for STS. """ -from future.utils import iteritems import copy import http.client import os @@ -94,7 +93,7 @@ def get_session_token(self, acl, duration_seconds=None): @staticmethod def _dump_acl_object(acl): result = {} - for k, v in iteritems(acl.__dict__): + for k, v in acl.__dict__.items(): if not k.startswith('_'): result[k] = v return result diff --git a/baidubce/utils.py b/baidubce/utils.py index 1318bbff..3295abf4 100644 --- a/baidubce/utils.py +++ b/baidubce/utils.py @@ -13,11 +13,6 @@ """ This module provide some tools for bce client. """ -# str() generator unicode,bytes() for ASCII -from __future__ import print_function -from __future__ import absolute_import -from builtins import str, bytes -from future.utils import iteritems, iterkeys, itervalues from baidubce import compat import os @@ -175,7 +170,7 @@ def safe_get_element(name, container): :return: **Value** """ - for k, v in iteritems(container): + for k, v in container.items(): if k.strip().lower() == name.strip().lower(): return v return "" @@ -320,7 +315,7 @@ def guess_content_type_by_file_name(file_name): file_name = compat.convert_to_string(file_name) name = os.path.basename(file_name.lower()) suffix = name.split('.')[-1] - if suffix in iterkeys(mime_map): + if suffix in mime_map.keys(): mime_type = mime_map[suffix] else: import mimetypes @@ -368,7 +363,7 @@ def get_canonical_querystring(params, for_signature): if params is None: return '' result = [] - for k, v in iteritems(params): + for k, v in params.items(): if not for_signature or k.lower != http_headers.AUTHORIZATION.lower(): if v is None: v = '' @@ -384,7 +379,7 @@ def print_object(obj): :return: """ tmp = [] - for k, v in iteritems(obj.__dict__): + for k, v in obj.__dict__.items(): if not k.startswith('__') and k != "raw_data": if isinstance(v, bytes): tmp.append("%s:'%s'" % (k, v)) @@ -419,7 +414,7 @@ def dict_to_python_object(d): :return: """ attr = {} - for k, v in iteritems(d): + for k, v in d.items(): if not isinstance(k, compat.string_types): k = compat.convert_to_string(k) k = pythonize_name(k) @@ -445,7 +440,7 @@ def _decorated(*args, **kwds): (f.__code__.co_varnames[i], v, types[f.__code__.co_varnames[i]])) - for k, v in iteritems(kwds): + for k, v in kwds.items(): if k in types: if v is None: raise ValueError('arg "%s" should not be None' % k) diff --git a/sample/aihc/README.md b/sample/aihc/README.md index 9b2ecd90..a2ec0307 100644 --- a/sample/aihc/README.md +++ b/sample/aihc/README.md @@ -63,9 +63,9 @@ Before running any samples, please update the configuration in [aihc_sample_conf 2. **Install Dependencies**: ```bash - pip install future six pycryptodome + pip install six pycryptodome # or - pip3 install future six pycryptodome + pip3 install six pycryptodome ``` 3. **Configure Credentials**: Update [aihc_sample_conf.py](aihc_sample_conf.py) diff --git a/sample/bos/bos_sample.py b/sample/bos/bos_sample.py index 8198ddf1..cbb709d7 100644 --- a/sample/bos/bos_sample.py +++ b/sample/bos/bos_sample.py @@ -11,7 +11,6 @@ """ Samples for bos client. """ -from __future__ import print_function import os import random import string diff --git a/setup.py b/setup.py index 54ca7b6e..281de624 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,6 @@ """ The setup script to install BCE SDK for python """ -from __future__ import absolute_import import io import os import re @@ -30,7 +29,6 @@ name='bce-python-sdk', version=SDK_VERSION, install_requires=['pycryptodome>=3.8.0', - 'future>=0.6.0', 'six>=1.4.0'], python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, <4', packages=['baidubce', diff --git a/test/bos/test_client_py2_and_py3.py b/test/bos/test_client_py2_and_py3.py index 801c8b86..617d571b 100644 --- a/test/bos/test_client_py2_and_py3.py +++ b/test/bos/test_client_py2_and_py3.py @@ -15,12 +15,6 @@ Test models of BOS. """ # compatibility py2 and py3 -from __future__ import absolute_import -from builtins import str -from builtins import bytes -from future.utils import iteritems -from future.utils import iterkeys -from future.utils import itervalues import base64 import multiprocessing