|
|
|
@@ -1,6 +1,6 @@
|
|
|
|
|
diff -Nru aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/auth/composer/roa_signature_composer.py aliyun-python-sdk-core-2.13.30/aliyunsdkcore/auth/composer/roa_signature_composer.py
|
|
|
|
|
--- aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/auth/composer/roa_signature_composer.py 2020-11-30 05:03:22.000000000 +0100
|
|
|
|
|
+++ aliyun-python-sdk-core-2.13.30/aliyunsdkcore/auth/composer/roa_signature_composer.py 2021-02-10 19:34:50.853927787 +0100
|
|
|
|
|
diff -Nru aliyun-python-sdk-core-2.13.36.orig/aliyunsdkcore/auth/composer/roa_signature_composer.py aliyun-python-sdk-core-2.13.36/aliyunsdkcore/auth/composer/roa_signature_composer.py
|
|
|
|
|
--- aliyun-python-sdk-core-2.13.36.orig/aliyunsdkcore/auth/composer/roa_signature_composer.py 2022-02-07 10:10:19.000000000 +0100
|
|
|
|
|
+++ aliyun-python-sdk-core-2.13.36/aliyunsdkcore/auth/composer/roa_signature_composer.py 2022-02-08 14:03:49.065743168 +0100
|
|
|
|
|
@@ -16,8 +16,8 @@
|
|
|
|
|
# under the License.
|
|
|
|
|
|
|
|
|
@@ -12,9 +12,9 @@ diff -Nru aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/auth/composer/roa_si
|
|
|
|
|
from aliyunsdkcore.auth.algorithm import sha_hmac1 as mac1
|
|
|
|
|
from aliyunsdkcore.utils import parameter_helper as helper
|
|
|
|
|
from aliyunsdkcore.http import format_type as FormatType
|
|
|
|
|
diff -Nru aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/auth/composer/rpc_signature_composer.py aliyun-python-sdk-core-2.13.30/aliyunsdkcore/auth/composer/rpc_signature_composer.py
|
|
|
|
|
--- aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/auth/composer/rpc_signature_composer.py 2020-11-30 05:03:22.000000000 +0100
|
|
|
|
|
+++ aliyun-python-sdk-core-2.13.30/aliyunsdkcore/auth/composer/rpc_signature_composer.py 2021-02-10 19:34:50.853927787 +0100
|
|
|
|
|
diff -Nru aliyun-python-sdk-core-2.13.36.orig/aliyunsdkcore/auth/composer/rpc_signature_composer.py aliyun-python-sdk-core-2.13.36/aliyunsdkcore/auth/composer/rpc_signature_composer.py
|
|
|
|
|
--- aliyun-python-sdk-core-2.13.36.orig/aliyunsdkcore/auth/composer/rpc_signature_composer.py 2022-02-07 10:10:19.000000000 +0100
|
|
|
|
|
+++ aliyun-python-sdk-core-2.13.36/aliyunsdkcore/auth/composer/rpc_signature_composer.py 2022-02-08 14:03:49.069743206 +0100
|
|
|
|
|
@@ -16,9 +16,9 @@
|
|
|
|
|
# under the License.
|
|
|
|
|
|
|
|
|
@@ -28,9 +28,9 @@ diff -Nru aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/auth/composer/rpc_si
|
|
|
|
|
|
|
|
|
|
from aliyunsdkcore.auth.algorithm import sha_hmac1 as mac1
|
|
|
|
|
from aliyunsdkcore.utils import parameter_helper as helper
|
|
|
|
|
diff -Nru aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/auth/signers/ecs_ram_role_signer.py aliyun-python-sdk-core-2.13.30/aliyunsdkcore/auth/signers/ecs_ram_role_signer.py
|
|
|
|
|
--- aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/auth/signers/ecs_ram_role_signer.py 2020-11-30 05:03:22.000000000 +0100
|
|
|
|
|
+++ aliyun-python-sdk-core-2.13.30/aliyunsdkcore/auth/signers/ecs_ram_role_signer.py 2021-02-10 19:34:50.853927787 +0100
|
|
|
|
|
diff -Nru aliyun-python-sdk-core-2.13.36.orig/aliyunsdkcore/auth/signers/ecs_ram_role_signer.py aliyun-python-sdk-core-2.13.36/aliyunsdkcore/auth/signers/ecs_ram_role_signer.py
|
|
|
|
|
--- aliyun-python-sdk-core-2.13.36.orig/aliyunsdkcore/auth/signers/ecs_ram_role_signer.py 2022-02-07 10:10:19.000000000 +0100
|
|
|
|
|
+++ aliyun-python-sdk-core-2.13.36/aliyunsdkcore/auth/signers/ecs_ram_role_signer.py 2022-02-08 14:03:49.057743093 +0100
|
|
|
|
|
@@ -23,7 +23,7 @@
|
|
|
|
|
import logging
|
|
|
|
|
import json
|
|
|
|
@@ -40,9 +40,9 @@ diff -Nru aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/auth/signers/ecs_ram
|
|
|
|
|
from aliyunsdkcore.auth.signers.signer import Signer
|
|
|
|
|
from aliyunsdkcore.acs_exception.exceptions import ServerException
|
|
|
|
|
|
|
|
|
|
diff -Nru aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/auth/signers/signer.py aliyun-python-sdk-core-2.13.30/aliyunsdkcore/auth/signers/signer.py
|
|
|
|
|
--- aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/auth/signers/signer.py 2020-11-30 05:03:22.000000000 +0100
|
|
|
|
|
+++ aliyun-python-sdk-core-2.13.30/aliyunsdkcore/auth/signers/signer.py 2021-02-10 19:34:50.853927787 +0100
|
|
|
|
|
diff -Nru aliyun-python-sdk-core-2.13.36.orig/aliyunsdkcore/auth/signers/signer.py aliyun-python-sdk-core-2.13.36/aliyunsdkcore/auth/signers/signer.py
|
|
|
|
|
--- aliyun-python-sdk-core-2.13.36.orig/aliyunsdkcore/auth/signers/signer.py 2022-02-07 10:10:19.000000000 +0100
|
|
|
|
|
+++ aliyun-python-sdk-core-2.13.36/aliyunsdkcore/auth/signers/signer.py 2022-02-08 14:03:49.049743018 +0100
|
|
|
|
|
@@ -22,7 +22,7 @@
|
|
|
|
|
|
|
|
|
|
from abc import ABCMeta, abstractmethod
|
|
|
|
@@ -52,9 +52,9 @@ diff -Nru aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/auth/signers/signer.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class Signer(with_metaclass(ABCMeta, object)):
|
|
|
|
|
diff -Nru aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/client.py aliyun-python-sdk-core-2.13.30/aliyunsdkcore/client.py
|
|
|
|
|
--- aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/client.py 2020-11-30 05:03:22.000000000 +0100
|
|
|
|
|
+++ aliyun-python-sdk-core-2.13.30/aliyunsdkcore/client.py 2021-02-10 19:34:50.857927802 +0100
|
|
|
|
|
diff -Nru aliyun-python-sdk-core-2.13.36.orig/aliyunsdkcore/client.py aliyun-python-sdk-core-2.13.36/aliyunsdkcore/client.py
|
|
|
|
|
--- aliyun-python-sdk-core-2.13.36.orig/aliyunsdkcore/client.py 2022-02-07 10:10:19.000000000 +0100
|
|
|
|
|
+++ aliyun-python-sdk-core-2.13.36/aliyunsdkcore/client.py 2022-02-08 14:04:53.930349797 +0100
|
|
|
|
|
@@ -28,8 +28,8 @@
|
|
|
|
|
import sys
|
|
|
|
|
|
|
|
|
@@ -66,7 +66,7 @@ diff -Nru aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/client.py aliyun-pyt
|
|
|
|
|
|
|
|
|
|
from aliyunsdkcore.acs_exception.exceptions import ClientException
|
|
|
|
|
from aliyunsdkcore.acs_exception.exceptions import ServerException
|
|
|
|
|
@@ -48,8 +48,8 @@
|
|
|
|
|
@@ -48,12 +48,12 @@
|
|
|
|
|
import aliyunsdkcore.utils
|
|
|
|
|
import aliyunsdkcore.utils.parameter_helper
|
|
|
|
|
import aliyunsdkcore.utils.validation
|
|
|
|
@@ -76,8 +76,14 @@ diff -Nru aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/client.py aliyun-pyt
|
|
|
|
|
+from requests.structures import OrderedDict
|
|
|
|
|
from aliyunsdkcore import compat
|
|
|
|
|
|
|
|
|
|
-from aliyunsdkcore.vendored.requests import Session
|
|
|
|
|
-from aliyunsdkcore.vendored.requests.adapters import HTTPAdapter
|
|
|
|
|
+from requests import Session
|
|
|
|
|
+from requests.adapters import HTTPAdapter
|
|
|
|
|
|
|
|
|
|
@@ -189,9 +189,7 @@
|
|
|
|
|
|
|
|
|
|
"""
|
|
|
|
|
@@ -207,9 +207,7 @@
|
|
|
|
|
default_agent = OrderedDict()
|
|
|
|
|
default_agent['Python'] = platform.python_version()
|
|
|
|
|
default_agent['Core'] = __import__('aliyunsdkcore').__version__
|
|
|
|
@@ -88,9 +94,9 @@ diff -Nru aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/client.py aliyun-pyt
|
|
|
|
|
|
|
|
|
|
return CaseInsensitiveDict(default_agent)
|
|
|
|
|
|
|
|
|
|
diff -Nru aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/compat.py aliyun-python-sdk-core-2.13.30/aliyunsdkcore/compat.py
|
|
|
|
|
--- aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/compat.py 2020-11-30 05:03:22.000000000 +0100
|
|
|
|
|
+++ aliyun-python-sdk-core-2.13.30/aliyunsdkcore/compat.py 2021-02-10 19:34:50.857927802 +0100
|
|
|
|
|
diff -Nru aliyun-python-sdk-core-2.13.36.orig/aliyunsdkcore/compat.py aliyun-python-sdk-core-2.13.36/aliyunsdkcore/compat.py
|
|
|
|
|
--- aliyun-python-sdk-core-2.13.36.orig/aliyunsdkcore/compat.py 2022-02-07 10:10:19.000000000 +0100
|
|
|
|
|
+++ aliyun-python-sdk-core-2.13.36/aliyunsdkcore/compat.py 2022-02-08 14:05:27.974668186 +0100
|
|
|
|
|
@@ -1,5 +1,5 @@
|
|
|
|
|
import sys
|
|
|
|
|
-from aliyunsdkcore.vendored import six
|
|
|
|
@@ -98,9 +104,9 @@ diff -Nru aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/compat.py aliyun-pyt
|
|
|
|
|
|
|
|
|
|
if six.PY2:
|
|
|
|
|
from base64 import encodestring as b64_encode_bytes
|
|
|
|
|
diff -Nru aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/endpoint/local_config_global_endpoint_resolver.py aliyun-python-sdk-core-2.13.30/aliyunsdkcore/endpoint/local_config_global_endpoint_resolver.py
|
|
|
|
|
--- aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/endpoint/local_config_global_endpoint_resolver.py 2020-11-30 05:03:22.000000000 +0100
|
|
|
|
|
+++ aliyun-python-sdk-core-2.13.30/aliyunsdkcore/endpoint/local_config_global_endpoint_resolver.py 2021-02-10 19:34:50.857927802 +0100
|
|
|
|
|
diff -Nru aliyun-python-sdk-core-2.13.36.orig/aliyunsdkcore/endpoint/local_config_global_endpoint_resolver.py aliyun-python-sdk-core-2.13.36/aliyunsdkcore/endpoint/local_config_global_endpoint_resolver.py
|
|
|
|
|
--- aliyun-python-sdk-core-2.13.36.orig/aliyunsdkcore/endpoint/local_config_global_endpoint_resolver.py 2022-02-07 10:10:19.000000000 +0100
|
|
|
|
|
+++ aliyun-python-sdk-core-2.13.36/aliyunsdkcore/endpoint/local_config_global_endpoint_resolver.py 2022-02-08 14:03:48.993742495 +0100
|
|
|
|
|
@@ -16,7 +16,7 @@
|
|
|
|
|
# specific language governing permissions and limitations
|
|
|
|
|
# under the License.
|
|
|
|
@@ -110,9 +116,9 @@ diff -Nru aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/endpoint/local_confi
|
|
|
|
|
|
|
|
|
|
from aliyunsdkcore.endpoint.local_config_regional_endpoint_resolver \
|
|
|
|
|
import LocalConfigRegionalEndpointResolver
|
|
|
|
|
diff -Nru aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/endpoint/local_config_regional_endpoint_resolver.py aliyun-python-sdk-core-2.13.30/aliyunsdkcore/endpoint/local_config_regional_endpoint_resolver.py
|
|
|
|
|
--- aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/endpoint/local_config_regional_endpoint_resolver.py 2020-11-30 05:03:22.000000000 +0100
|
|
|
|
|
+++ aliyun-python-sdk-core-2.13.30/aliyunsdkcore/endpoint/local_config_regional_endpoint_resolver.py 2021-02-10 19:34:50.857927802 +0100
|
|
|
|
|
diff -Nru aliyun-python-sdk-core-2.13.36.orig/aliyunsdkcore/endpoint/local_config_regional_endpoint_resolver.py aliyun-python-sdk-core-2.13.36/aliyunsdkcore/endpoint/local_config_regional_endpoint_resolver.py
|
|
|
|
|
--- aliyun-python-sdk-core-2.13.36.orig/aliyunsdkcore/endpoint/local_config_regional_endpoint_resolver.py 2022-02-07 10:10:19.000000000 +0100
|
|
|
|
|
+++ aliyun-python-sdk-core-2.13.36/aliyunsdkcore/endpoint/local_config_regional_endpoint_resolver.py 2022-02-08 14:03:49.017742719 +0100
|
|
|
|
|
@@ -21,7 +21,7 @@
|
|
|
|
|
import json
|
|
|
|
|
|
|
|
|
@@ -122,17 +128,15 @@ diff -Nru aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/endpoint/local_confi
|
|
|
|
|
from aliyunsdkcore.endpoint.endpoint_resolver_base import EndpointResolverBase
|
|
|
|
|
from aliyunsdkcore.endpoint.resolver_endpoint_request import ResolveEndpointRequest
|
|
|
|
|
|
|
|
|
|
diff -Nru aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/http/http_response.py aliyun-python-sdk-core-2.13.30/aliyunsdkcore/http/http_response.py
|
|
|
|
|
--- aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/http/http_response.py 2020-11-30 05:03:22.000000000 +0100
|
|
|
|
|
+++ aliyun-python-sdk-core-2.13.30/aliyunsdkcore/http/http_response.py 2021-02-10 19:34:50.857927802 +0100
|
|
|
|
|
@@ -20,12 +20,12 @@
|
|
|
|
|
diff -Nru aliyun-python-sdk-core-2.13.36.orig/aliyunsdkcore/http/http_response.py aliyun-python-sdk-core-2.13.36/aliyunsdkcore/http/http_response.py
|
|
|
|
|
--- aliyun-python-sdk-core-2.13.36.orig/aliyunsdkcore/http/http_response.py 2022-02-07 10:10:19.000000000 +0100
|
|
|
|
|
+++ aliyun-python-sdk-core-2.13.36/aliyunsdkcore/http/http_response.py 2022-02-08 14:03:49.029742831 +0100
|
|
|
|
|
@@ -20,11 +20,11 @@
|
|
|
|
|
import os
|
|
|
|
|
import logging
|
|
|
|
|
|
|
|
|
|
-from aliyunsdkcore.vendored.requests import Request, Session
|
|
|
|
|
-from aliyunsdkcore.vendored.requests.packages import urllib3
|
|
|
|
|
+from requests import Request, Session
|
|
|
|
|
+from requests.packages import urllib3
|
|
|
|
|
-from aliyunsdkcore.vendored.requests import Session, Request
|
|
|
|
|
+from requests import Session, Request
|
|
|
|
|
from aliyunsdkcore.http.http_request import HttpRequest
|
|
|
|
|
from aliyunsdkcore.http import protocol_type as PT
|
|
|
|
|
|
|
|
|
@@ -141,9 +145,9 @@ diff -Nru aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/http/http_response.p
|
|
|
|
|
|
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
logger.setLevel(logging.DEBUG)
|
|
|
|
|
diff -Nru aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/request.py aliyun-python-sdk-core-2.13.30/aliyunsdkcore/request.py
|
|
|
|
|
--- aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/request.py 2020-11-30 05:03:22.000000000 +0100
|
|
|
|
|
+++ aliyun-python-sdk-core-2.13.30/aliyunsdkcore/request.py 2021-02-10 19:34:50.857927802 +0100
|
|
|
|
|
diff -Nru aliyun-python-sdk-core-2.13.36.orig/aliyunsdkcore/request.py aliyun-python-sdk-core-2.13.36/aliyunsdkcore/request.py
|
|
|
|
|
--- aliyun-python-sdk-core-2.13.36.orig/aliyunsdkcore/request.py 2022-02-07 10:10:19.000000000 +0100
|
|
|
|
|
+++ aliyun-python-sdk-core-2.13.36/aliyunsdkcore/request.py 2022-02-08 14:03:49.081743318 +0100
|
|
|
|
|
@@ -19,9 +19,9 @@
|
|
|
|
|
|
|
|
|
|
# coding=utf-8
|
|
|
|
@@ -166,3 +170,16 @@ diff -Nru aliyun-python-sdk-core-2.13.30.orig/aliyunsdkcore/request.py aliyun-py
|
|
|
|
|
|
|
|
|
|
"""
|
|
|
|
|
Acs request model.
|
|
|
|
|
diff -Nru aliyun-python-sdk-core-2.13.36.orig/setup.py aliyun-python-sdk-core-2.13.36/setup.py
|
|
|
|
|
--- aliyun-python-sdk-core-2.13.36.orig/setup.py 2022-02-07 10:10:19.000000000 +0100
|
|
|
|
|
+++ aliyun-python-sdk-core-2.13.36/setup.py 2022-02-08 14:05:58.058949539 +0100
|
|
|
|
|
@@ -58,8 +58,7 @@
|
|
|
|
|
'url': URL,
|
|
|
|
|
'keywords': ["aliyun", "sdk", "core"],
|
|
|
|
|
'packages': find_packages(exclude=["tests*"]),
|
|
|
|
|
- 'package_data': {'aliyunsdkcore': ['data/*.json', '*.pem', "vendored/*.pem"],
|
|
|
|
|
- 'aliyunsdkcore.vendored.requests.packages.certifi': ['cacert.pem']},
|
|
|
|
|
+ 'package_data': {'aliyunsdkcore': ['data/*.json', '*.pem']},
|
|
|
|
|
'platforms': 'any',
|
|
|
|
|
'install_requires': requires,
|
|
|
|
|
'classifiers': (
|