modify import

Author: wallisyan

aliyun-python-sdk-core/alibabacloud/compat.py

@@ -1,6 +1,11 @@
+import sys
 from alibabacloud.vendored import six
 
 if six.PY2:
+    from base64 import encodestring as b64_encode_bytes
+    from base64 import decodestring as b64_decode_bytes
+    from urllib import urlencode
+
 
     def ensure_bytes(s, encoding='utf-8', errors='strict'):
         if isinstance(s, unicode):
@@ -17,6 +22,10 @@ def ensure_string(s, encoding='utf-8', errors='strict'):
         raise ValueError("Expected str or unicode, received %s." % type(s))
 
 else:
+    from base64 import encodebytes as b64_encode_bytes
+    from base64 import decodebytes as b64_decode_bytes
+    from urllib.parse import urlencode
+
 
     def ensure_bytes(s, encoding='utf-8', errors='strict'):
         if isinstance(s, str):

aliyun-python-sdk-core/alibabacloud/credentials/provider.py

@@ -2,7 +2,7 @@
 import os
 import time
 
-from alibabacloud.exception import ClientException
+from alibabacloud.exceptions import ClientException
 from alibabacloud.credentials import AccessKeyCredentials
 from alibabacloud.credentials import BearerTokenCredentials
 from alibabacloud.credentials import SecurityCredentials

aliyun-python-sdk-core/alibabacloud/endpoint/chained_endpoint_resolver.py

@@ -17,7 +17,7 @@
 # under the License.
 #
 
-from aliyunsdkcore.acs_exception.exceptions import ClientException
+from alibabacloud.exceptions import ClientException
 from alibabacloud.endpoint import EndpointResolver
 
 import aliyunsdkcore.acs_exception.error_code as error_code

aliyun-python-sdk-core/alibabacloud/endpoint/location_service_endpoint_resolver.py

@@ -20,7 +20,7 @@
 import threading
 import json
 
-from aliyunsdkcore.acs_exception.exceptions import ServerException
+from alibabacloud.exceptions import ServerException
 from alibabacloud.endpoint.endpoint_resolver_base import EndpointResolverBase
 from alibabacloud.endpoint.location_endpoint_caller import DescribeEndpointCaller
 DEFAULT_LOCATION_SERVICE_ENDPOINT = "location-readonly.aliyuncs.com"
@@ -78,14 +78,14 @@ def _call_location_service(self, key, raw_request):
                                           location_endpoint=self._location_service_endpoint)
 
         except ServerException as e:
-            if "InvalidRegionId" == e.get_error_code() and \
-               "The specified region does not exist." == e.get_error_msg():
+            if "InvalidRegionId" == e.error_code and \
+               "The specified region does not exist." == e.error_message:
                 # No such region`
                 self._invalid_region_ids.add(raw_request.region_id)
                 self.put_endpoint_entry(key, None)
                 return
-            elif "Illegal Parameter" == e.get_error_code() and \
-                 "Please check the parameters" == e.get_error_msg():
+            elif "Illegal Parameter" == e.error_code and \
+                 "Please check the parameters" == e.error_message:
                 # No such product
                 self._invalid_product_codes.add(raw_request.product_code_lower)
                 self.put_endpoint_entry(key, None)

aliyun-python-sdk-core/alibabacloud/exception.py

@@ -0,0 +1,71 @@
+# Copyright 2019 Alibaba Cloud Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+SDK_INVALID_REGION_ID = 'SDK.InvalidRegionId'
+SDK_SERVER_UNREACHABLE = 'SDK.ServerUnreachable'
+SDK_INVALID_REQUEST = 'SDK.InvalidRequest'
+SDK_MISSING_ENDPOINTS_FILER = 'SDK.MissingEndpointsFiler'
+SDK_UNKNOWN_SERVER_ERROR = 'SDK.UnknownServerError'
+SDK_INVALID_CREDENTIAL = 'SDK.InvalidCredential'
+SDK_INVALID_SESSION_EXPIRATION = 'SDK.InvalidSessionExpiration'
+SDK_GET_SESSION_CREDENTIAL_FAILED = 'SDK.GetSessionCredentialFailed'
+SDK_INVALID_PARAMS = 'SDK.InvalidParams'
+SDK_NOT_SUPPORT = 'SDK.NotSupport'
+SDK_ENDPOINT_RESOLVING_ERROR = 'SDK.EndpointResolvingError'
+SDK_ENDPOINT_TESTABILITY = 'SDK.EndpointTestability'
+SDK_HTTP_ERROR = 'SDK.HttpError'
+SDK_INVALID_PARAMETER = "SDK.InvalidParameter"
+
+
+class ClientException(Exception):
+    """client exception"""
+
+    def __init__(self, error_code, error_message,):
+        """
+
+        :param error_code: error code
+        :param error_message: error message
+        :return:
+        """
+        Exception.__init__(self)
+        self.__error_type = 'Client'
+        self.error_code = error_code
+        self.error_message = error_message
+
+    def __str__(self):
+        return "%s %s" % (
+            self.error_code,
+            self.error_message,
+        )
+
+
+class ServerException(Exception):
+
+    def __init__(self, error_code, error_message, endpoint=None, http_status=None, request_id=None, service_name= None):
+        self.error_code = error_code
+        self.error_message = error_message
+        self.endpoint = endpoint
+        self.http_status = http_status
+        self.request_id = request_id
+        # TODO service_name
+        self.service_name = service_name
+
+    def __str__(self):
+        return "HTTP Status: %s Error:%s %s RequestID: %s" % (
+            str(self.http_status),
+            self.error_code,
+            self.error_message,
+            self.request_id
+        )
+

aliyun-python-sdk-core/alibabacloud/exceptions.py

@@ -14,7 +14,7 @@
 
 from alibabacloud.handlers import RequestHandler
 
-from alibabacloud.vendored import Request, Session
+from alibabacloud.vendored.requests import Request, Session
 from alibabacloud.vendored.requests.packages import urllib3
 
 
@@ -54,7 +54,7 @@ def _do_request(self, context):
 
                 # requests.adapters.DEFAULT_RETRIES = 0
             except IOError as e:
-                from aliyunsdkcore.acs_exception.exceptions import ClientException
+                from alibabacloud.exceptions import ClientException
                 from aliyunsdkcore.acs_exception import error_code
                 exception = ClientException(error_code.SDK_HTTP_ERROR, str(e))
 

aliyun-python-sdk-core/alibabacloud/handlers/http_handler.py

@@ -14,7 +14,7 @@
 import json
 
 from alibabacloud.handlers import RequestHandler
-from alibabacloud.vendored import codes
+from alibabacloud.vendored.requests import codes
 
 
 class ServerErrorHandler(RequestHandler):
@@ -46,12 +46,9 @@ def handle_response(self, context):
                         server_error_code = 'InvalidAccessKeySecret'
                         server_error_message = 'The AccessKeySecret is incorrect. ' \
                                                'Please check your AccessKeyId and AccessKeySecret.'
-                from aliyunsdkcore.acs_exception.exceptions import ServerException
-                exception = ServerException(
-                    server_error_code,
-                    server_error_message,
-                    http_status=response.status_code,
-                    request_id=request_id)
+                from alibabacloud.exceptions import ServerException
+                exception = ServerException(server_error_code, server_error_message,
+                                            context.endpoint, response.status_code, request_id)
                 context.exception = exception
 
     @staticmethod

aliyun-python-sdk-core/alibabacloud/handlers/server_error_handler.py

@@ -17,7 +17,7 @@
 
 from alibabacloud.utils.load_json_from_data_dir import _load_json_from_data_dir
 import alibabacloud.utils.validation as validation
-from aliyunsdkcore.acs_exception.exceptions import ClientException, ServerException
+from alibabacloud.exceptions import ServerException, ClientException
 import aliyunsdkcore.acs_exception.error_code as error_code
 
 logger = logging.getLogger(__name__)
@@ -77,14 +77,14 @@ def should_retry(self, retry_policy_context):
         exception = retry_policy_context.exception
 
         if isinstance(exception, ClientException):
-            if exception.get_error_code() == error_code.SDK_HTTP_ERROR:
+            if exception.error_code == error_code.SDK_HTTP_ERROR:
 
                 logger.debug("Retryable ClientException occurred. ClientException:%s",
                              exception)
                 return RetryCondition.SHOULD_RETRY
 
         if isinstance(exception, ServerException):
-            error_code_ = exception.get_error_code()
+            error_code_ = exception.error_code
             normal_errors = _find_data_in_retry_config("RetryableNormalErrors",
                                                        client,
                                                        self.retry_config)

aliyun-python-sdk-core/alibabacloud/retry/retry_condition.py

@@ -21,9 +21,9 @@
 from alibabacloud.utils import format_type as FormatType, parameter_helper as helper
 from alibabacloud.signer.algorithm import ShaHmac1 as mac1
 from alibabacloud.vendored.six import iteritems
-from alibabacloud.vendored.six import pathname2url
+from alibabacloud.vendored.six.moves.urllib.request import pathname2url
 from alibabacloud.compat import urlencode
-from aliyunsdkcore.acs_exception.exceptions import ClientException
+from alibabacloud.exceptions import ClientException
 from alibabacloud.utils.parameter_helper import md5_sum
 
 FORMAT_ISO_8601 = "%Y-%m-%dT%H:%M:%SZ"