Merge pull request #256 from aliyun/refactor4.test

Refactor4.test

Author: wallisyan

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

@@ -1,7 +1,22 @@
+# 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.
+
 import logging
 
 
 class NullHandler(logging.Handler):
+
     def emit(self, record):
         pass
 

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

@@ -11,13 +11,13 @@
 # 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.
+
 import os
 import time
 from alibabacloud.handlers import RequestContext
 from alibabacloud.handlers.prepare_handler import PrepareHandler
 from alibabacloud.handlers.credentials_handler import CredentialsHandler
 from alibabacloud.handlers.signer_handler import SignerHandler
-
 from alibabacloud.handlers.timeout_config_reader import TimeoutConfigReader
 from alibabacloud.handlers.endpoint_handler import EndpointHandler
 from alibabacloud.handlers.log_handler import LogHandler
@@ -36,8 +36,8 @@
     LogHandler(),
     EndpointHandler(),
     RetryHandler(),
-    ServerErrorHandler(),
     HttpHandler(),
+    ServerErrorHandler(),
 ]
 
 DEFAULT_FORMAT = 'JSON'
@@ -131,9 +131,9 @@ def read_from_profile(self):
 
         else:
             profile = load_config(self.config_file)
-        
+
         for key in dir(self):
-            if profile.get(key)is not None and getattr(self, key) is None:
+            if profile.get(key) is not None and getattr(self, key) is None:
                 # 不存在config当中的值 pass
                 setattr(self, key, profile.get(key))
             # print('不存在config当中的值', key)
@@ -180,7 +180,9 @@ def __init__(self, client_config, credentials_provider):
         self.logger = None  # TODO initialize
         from alibabacloud.endpoint.default_endpoint_resolver import DefaultEndpointResolver
 
-        self.endpoint_resolver = DefaultEndpointResolver(self.config)  # TODO initialize
+        self.endpoint_resolver = DefaultEndpointResolver(self.config,
+                                                         self.credentials_provider)
+        # TODO initialize
         # retry
         if self.config.enable_retry:
             self.retry_policy = retry_policy.get_default_retry_policy(

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

@@ -1,4 +1,19 @@
+# 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.
+
 import sys
+
 from alibabacloud.vendored import six
 
 if six.PY2:

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

@@ -1,3 +1,17 @@
+# 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.
+
 import json
 import os
 import time
@@ -32,7 +46,6 @@ def __init__(self):
         self._cached_credentials = None
 
     def provide(self):
-
         return self._cached_credentials
 
 

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

@@ -14,7 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-#
 
 
 class EndpointResolver(object):

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

@@ -1,4 +1,3 @@
-#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with self work for additional information
@@ -15,12 +14,10 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-#
 
 from alibabacloud.exceptions import ClientException
 from alibabacloud.endpoint import EndpointResolver
 
-import aliyunsdkcore.acs_exception.error_code as error_code
 import aliyunsdkcore.acs_exception.error_msg as error_msg
 
 
@@ -36,7 +33,6 @@ def _check_product_code(self, request):
                 return
 
         raise ClientException(
-            error_code.SDK_ENDPOINT_RESOLVING_ERROR,
             error_msg.ENDPOINT_NO_PRODUCT.format(
                 product_code=request.product_code)
         )
@@ -47,7 +43,6 @@ def _check_region_id(self, request):
                 return
 
         raise ClientException(
-            error_code.SDK_ENDPOINT_RESOLVING_ERROR,
             error_msg.INVALID_REGION_ID.format(region_id=request.region_id)
         )
 
@@ -73,7 +68,6 @@ def resolve(self, request):
         self._check_region_id(request)
 
         raise ClientException(
-            error_code.SDK_ENDPOINT_RESOLVING_ERROR,
             error_msg.ENDPOINT_NO_REGION.format(
                 region_id=request.region_id,
                 product_code=request.product_code,

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

@@ -29,7 +29,7 @@ class DefaultEndpointResolver(EndpointResolver):
     # Not recommended
     predefined_endpoint_resolver = UserCustomizedEndpointResolver()
 
-    def __init__(self, config, user_config=None):
+    def __init__(self, config, credentials_provider, user_config=None):
 
         self._user_customized_endpoint_resolver = UserCustomizedEndpointResolver()
 
@@ -38,7 +38,7 @@ def __init__(self, config, user_config=None):
             self._user_customized_endpoint_resolver,
             LocalConfigRegionalEndpointResolver(user_config),
             LocalConfigGlobalEndpointResolver(user_config),
-            LocationServiceEndpointResolver(config),
+            LocationServiceEndpointResolver(config, credentials_provider),
         ]
 
         self._resolver = ChainedEndpointResolver(endpoint_resolvers)

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

@@ -1,4 +1,3 @@
-#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with self work for additional information
@@ -15,7 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-#
 
 from alibabacloud.endpoint import EndpointResolver
 

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

@@ -1,4 +1,3 @@
-#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with self work for additional information
@@ -15,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-#
+
 from alibabacloud.vendored.six import iteritems
 
 from alibabacloud.endpoint.local_config_regional_endpoint_resolver \
@@ -35,7 +34,8 @@ def _init_global_endpoint_data(self, obj):
 
         global_endpoints = obj["global_endpoints"]
         for location_service_code, endpoint in iteritems(global_endpoints):
-            self.put_endpoint_entry(self._make_endpoint_entry_key(location_service_code), endpoint)
+            self.put_endpoint_entry(self._make_endpoint_entry_key(location_service_code),
+                                    endpoint)
 
     def resolve(self, request):
         if request.is_open_api_endpoint() and self.is_region_id_valid(request):

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

@@ -1,4 +1,3 @@
-#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with self work for additional information
@@ -15,7 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-#
 
 import os.path
 import json
@@ -53,7 +51,8 @@ def _init_regional_endpoint_data(self, obj):
         self._regional_endpoint_data = obj["regional_endpoints"]
         for code, product_data in iteritems(obj["regional_endpoints"]):
             for region_id, endpoint in iteritems(product_data):
-                self.put_endpoint_entry(self._make_endpoint_entry_key(code, region_id), endpoint)
+                self.put_endpoint_entry(self._make_endpoint_entry_key(code, region_id),
+                                        endpoint)
 
     def _init_region_ids(self, obj):
         if "regions" not in obj:
@@ -82,7 +81,8 @@ def resolve(self, request):
             return None
 
     def get_endpoint_key_from_request(self, request):
-        return self._make_endpoint_entry_key(request.product_code.lower(), request.region_id.lower())
+        return self._make_endpoint_entry_key(request.product_code.lower(),
+                                             request.region_id.lower())
 
     def _make_endpoint_entry_key(self, product_code, region_id):
         return self._get_normalized_product_code(product_code) + "." + region_id
@@ -103,7 +103,6 @@ def is_product_code_valid(self, request):
             request.region_id,
             self._get_normalized_product_code(request.product_code),
             request.location_service_code,
-            request.endpoint_type,
-            request.credentials_provider
+            request.endpoint_type
         )
         return EndpointResolverBase.is_product_code_valid(self, tmp_request)