py3

aliyunsdkcore/acs_exception/exceptions.py

@@ -27,7 +27,7 @@ Created on 6/15/2015
 @author: alex jiang
 """
 
-import error_type
+from . import error_type
 
 
 class ClientException(Exception):

aliyunsdkcore/auth/oss_signature_composer.py

@@ -23,10 +23,10 @@ import sys
 
 parentdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.insert(0, parentdir)
-import roa_signature_composer
-import sha_hmac1 as mac1
+from . import roa_signature_composer
+from . import sha_hmac1 as mac1
 from ..utils import parameter_helper as helper
-import urllib
+import urllib.request, urllib.parse, urllib.error
 
 ACCEPT = "Accept"
 CONTENT_MD5 = "Content-MD5"
@@ -50,7 +50,7 @@ def refresh_sign_parameters(
 
 
 def __build_query_string(uri, queries):
-    sorted_map = sorted(queries.items(), key=lambda queries: queries[0])
+    sorted_map = sorted(list(queries.items()), key=lambda queries: queries[0])
     if len(sorted_map) > 0:
         uri += "?"
         for (k, v) in sorted_map:
@@ -149,7 +149,7 @@ def get_url(queries, uri_pattern, path_parameters):
         uri_pattern, path_parameters)
     if not url.endswith("?"):
         url += "?"
-    url += urllib.urlencode(queries)
+    url += urllib.parse.urlencode(queries)
     if url.endswith("?"):
         url = url[0:(len(url) - 1)]
     return url

aliyunsdkcore/auth/roa_signature_composer.py

@@ -23,10 +23,10 @@ import sys
 
 parentdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.insert(0, parentdir)
-import sha_hmac1 as mac1
+from . import sha_hmac1 as mac1
 from ..utils import parameter_helper as helper
 from ..http import format_type as FormatType
-import urllib
+import urllib.request, urllib.parse, urllib.error
 
 ACCEPT = "Accept"
 CONTENT_MD5 = "Content-MD5"
@@ -90,7 +90,7 @@ def compose_string_to_sign(
 def replace_occupied_parameters(uri_pattern, paths):
     result = uri_pattern
     if paths is not None:
-        for (key, value) in paths.items():
+        for (key, value) in list(paths.items()):
             target = "[" + key + "]"
             result = result.replace(target, value)
     return result
@@ -102,10 +102,10 @@ def replace_occupied_parameters(uri_pattern, paths):
 def build_canonical_headers(headers, header_begin):
     result = ""
     unsort_map = dict()
-    for (key, value) in headers.iteritems():
+    for (key, value) in headers.items():
         if key.lower().find(header_begin) >= 0:
             unsort_map[key.lower()] = value
-    sort_map = sorted(unsort_map.iteritems(), key=lambda d: d[0])
+    sort_map = sorted(iter(unsort_map.items()), key=lambda d: d[0])
     for (key, value) in sort_map:
         result += key + ":" + value
         result += HEADER_SEPARATOR
@@ -121,7 +121,7 @@ def __build_query_string(uri, queries):
     if len(uri_parts) > 1 and uri_parts[1] is not None:
         queries[uri_parts[1]] = None
     query_builder = uri_parts[0]
-    sorted_map = sorted(queries.items(), key=lambda queries: queries[0])
+    sorted_map = sorted(list(queries.items()), key=lambda queries: queries[0])
     if len(sorted_map) > 0:
         query_builder += "?"
     for (k, v) in sorted_map:
@@ -188,7 +188,7 @@ def get_url(uri_pattern, queries, path_parameters):
     url += replace_occupied_parameters(uri_pattern, path_parameters)
     if not url.endswith("?"):
         url += "?"
-    url += urllib.urlencode(queries)
+    url += urllib.parse.urlencode(queries)
     if url.endswith("?"):
         url = url[0:(len(url) - 1)]
     return url

aliyunsdkcore/auth/rpc_signature_composer.py

@@ -23,8 +23,8 @@ import sys
 
 parentdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.insert(0, parentdir)
-import sha_hmac1 as mac1
-import urllib
+from . import sha_hmac1 as mac1
+import urllib.request, urllib.parse, urllib.error
 from ..utils import parameter_helper as helper
 
 
@@ -55,7 +55,7 @@ def __refresh_sign_parameters(
 
 
 def __pop_standard_urlencode(query):
-    ret = urllib.urlencode(query)
+    ret = urllib.parse.urlencode(query)
     ret = ret.replace('+', '%20')
     ret = ret.replace('*', '%2A')
     ret = ret.replace('%7E', '~')
@@ -64,9 +64,9 @@ def __pop_standard_urlencode(query):
 
 def __compose_string_to_sign(method, queries):
     canonicalized_query_string = ""
-    sorted_parameters = sorted(queries.items(), key=lambda queries: queries[0])
+    sorted_parameters = sorted(list(queries.items()), key=lambda queries: queries[0])
     string_to_sign = method + "&%2F&" + \
-        urllib.pathname2url(__pop_standard_urlencode(sorted_parameters))
+        urllib.request.pathname2url(__pop_standard_urlencode(sorted_parameters))
     return string_to_sign
 
 

aliyunsdkcore/auth/url_encoder.py

@@ -18,7 +18,7 @@
 # under the License.
 
 # coding=utf-8
-import urllib
+import urllib.request, urllib.parse, urllib.error
 import sys
 
 """
@@ -36,12 +36,12 @@ def get_encode_str(params):
     :param params: dict parameters
     :return: string
     """
-    list_params = sorted(params.iteritems(), key=lambda d: d[0])
-    encode_str = urllib.urlencode(list_params)
+    list_params = sorted(iter(params.items()), key=lambda d: d[0])
+    encode_str = urllib.parse.urlencode(list_params)
     if sys.stdin.encoding is None:
-        res = urllib.quote(encode_str.decode('cp936').encode('utf8'), '')
+        res = urllib.parse.quote(encode_str.decode('cp936').encode('utf8'), '')
     else:
-        res = urllib.quote(
+        res = urllib.parse.quote(
             encode_str.decode(
                 sys.stdin.encoding).encode('utf8'), '')
     res = res.replace("+", "%20")

aliyunsdkcore/client.py

@@ -20,7 +20,7 @@
 # coding=utf-8
 import os
 import sys
-import httplib
+import http.client
 import warnings
 warnings.filterwarnings("once", category=DeprecationWarning)
 
@@ -252,7 +252,7 @@ class AcsClient:
             # data instead
             pass
 
-        if status != httplib.OK:
+        if status != http.client.OK:
             server_error_code, server_error_message = self._parse_error_info_from_response_body(
                 body)
             raise ServerException(

aliyunsdkcore/http/format_type.py

@@ -45,9 +45,9 @@ def map_accept_to_format(accept):
 
 
 if __name__ == "__main__":
-    print map_format_to_accept(XML)
-    print map_format_to_accept(JSON)
-    print map_format_to_accept(RAW)
-    print map_accept_to_format("application/xml")
-    print map_accept_to_format("text/xml")
-    print map_accept_to_format("application/json")
+    print(map_format_to_accept(XML))
+    print(map_format_to_accept(JSON))
+    print(map_format_to_accept(RAW))
+    print(map_accept_to_format("application/xml"))
+    print(map_accept_to_format("text/xml"))
+    print(map_accept_to_format("application/json"))

aliyunsdkcore/http/http_request.py

@@ -23,7 +23,7 @@ import sys
 
 parentdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.insert(0, parentdir)
-import format_type
+from . import format_type
 from ..utils import parameter_helper as helper
 
 

aliyunsdkcore/http/http_response.py

@@ -17,10 +17,10 @@
 
 # coding=utf-8
 __author__ = 'alex jiang'
-import httplib
+import http.client
 
-from http_request import HttpRequest
-import protocol_type as PT
+from .http_request import HttpRequest
+from . import protocol_type as PT
 
 
 class HttpResponse(HttpRequest):
@@ -72,7 +72,7 @@ class HttpResponse(HttpRequest):
         if self.__port is None or self.__port == "":
             self.__port = 80
         try:
-            self.__connection = httplib.HTTPConnection(
+            self.__connection = http.client.HTTPConnection(
                 self.get_host(), self.__port)
             self.__connection.connect()
             self.__connection.request(
@@ -89,7 +89,7 @@ class HttpResponse(HttpRequest):
         if self.__port is None or self.__port == "":
             self.__port = 80
         try:
-            self.__connection = httplib.HTTPConnection(
+            self.__connection = http.client.HTTPConnection(
                 self.get_host(), self.__port)
             self.__connection.connect()
             self.__connection.request(
@@ -107,7 +107,7 @@ class HttpResponse(HttpRequest):
             self.__port = 443
         try:
             self.__port = 443
-            self.__connection = httplib.HTTPSConnection(
+            self.__connection = http.client.HTTPSConnection(
                 self.get_host(),
                 self.__port,
                 cert_file=self.__cert_file,
@@ -128,7 +128,7 @@ class HttpResponse(HttpRequest):
             self.__port = 443
         try:
             self.__port = 443
-            self.__connection = httplib.HTTPSConnection(
+            self.__connection = http.client.HTTPSConnection(
                 self.get_host(),
                 self.__port,
                 cert_file=self.__cert_file,

aliyunsdkcore/profile/region_provider.py

@@ -132,8 +132,8 @@ def convert_dict_to_endpointsxml(mdict):
     content += '</RegionIds>\n' + '<Products>\n'
     for item in products:
         content += '<Product>\n'
-        content += '<ProductName>' + item.keys()[0] + '</ProductName>\n'
-        content += '<DomainName>' + item[item.keys()[0]] + '</DomainName>\n'
+        content += '<ProductName>' + list(item.keys())[0] + '</ProductName>\n'
+        content += '<DomainName>' + item[list(item.keys())[0]] + '</DomainName>\n'
         content += '</Product>\n'
     content += '</Products>'
     content += endfix
@@ -144,8 +144,8 @@ def convert_dict_to_endpointsxml(mdict):
     try:
         f.write(''.join(content))
     except Exception as e:
-        print e
-        print "Please confirm you has use sudo + cmd"
+        print(e)
+        print("Please confirm you has use sudo + cmd")
     finally:
         f.close()
 
@@ -160,5 +160,5 @@ def _createFile(filename):
 
 
 if __name__ == '__main__':
-    print find_product_domain('cn-hangzhou', 'Rds')
+    print(find_product_domain('cn-hangzhou', 'Rds'))
     modify_point('ecs', 'cn-beijing-2', 'ecs.aliyuncs.com')

aliyunsdkcore/request.py

@@ -48,11 +48,10 @@ STYLE_ROA = 'ROA'
 STYLE_OSS = 'OSS'
 
 
-class AcsRequest:
+class AcsRequest(metaclass=abc.ABCMeta):
     """
     Acs request base class. This class wraps up common parameters for a request.
     """
-    __metaclass__ = abc.ABCMeta
 
     def __init__(self, product, version=None,
                  action_name=None,
@@ -239,7 +238,7 @@ class RpcRequest(AcsRequest):
 
     def get_url(self, region_id, ak, secret):
         sign_params = self.__get_sign_params()
-        if 'RegionId' not in sign_params.keys():
+        if 'RegionId' not in list(sign_params.keys()):
             sign_params['RegionId'] = region_id
         url = rpc_signer.get_signed_url(
             sign_params,
@@ -335,7 +334,7 @@ class RoaRequest(AcsRequest):
         if (self.get_content() is not None):
             md5_str = md5_tool.get_md5_base64_str(self.get_content())
             self.add_header('Content-MD5', md5_str)
-        if 'RegionId' not in sign_params.keys():
+        if 'RegionId' not in list(sign_params.keys()):
             sign_params['RegionId'] = region_id
         signed_headers = roa_signer.get_signature_headers(
             sign_params,
@@ -355,7 +354,7 @@ class RoaRequest(AcsRequest):
         :return: String
         """
         sign_params = self.get_query_params()
-        if region_id not in sign_params.keys():
+        if region_id not in list(sign_params.keys()):
             sign_params['RegionId'] = region_id
         url = roa_signer.get_url(
             self.get_uri_pattern(),
@@ -442,7 +441,7 @@ class OssRequest(AcsRequest):
         :return:
         """
         sign_params = self.get_query_params()
-        if 'RegionId' not in sign_params.keys():
+        if 'RegionId' not in list(sign_params.keys()):
             sign_params['RegionId'] = region_id
         signed_headers = oss_signer.get_signature_headers(
             sign_params,
@@ -463,7 +462,7 @@ class OssRequest(AcsRequest):
         :return: String
         """
         sign_params = self.get_query_params()
-        if 'RegionId' not in sign_params.keys():
+        if 'RegionId' not in list(sign_params.keys()):
             sign_params['RegionId'] = region_id
         url = oss_signer.get_url(
             sign_params,

aliyunsdkcore/utils/parameter_helper.py

@@ -23,7 +23,7 @@ import hashlib
 import base64
 import uuid
 import time
-import urllib
+import urllib.request, urllib.parse, urllib.error
 import sys
 
 TIME_ZONE = "GMT"
@@ -50,9 +50,9 @@ def md5_sum(content):
 def percent_encode(encodeStr):
     encodeStr = str(encodeStr)
     if sys.stdin.encoding is None:
-        res = urllib.quote(encodeStr.decode('cp936').encode('utf8'), '')
+        res = urllib.parse.quote(encodeStr.decode('cp936').encode('utf8'), '')
     else:
-        res = urllib.quote(
+        res = urllib.parse.quote(
             encodeStr.decode(
                 sys.stdin.encoding).encode('utf8'), '')
     res = res.replace('+', '%20')
@@ -62,6 +62,6 @@ def percent_encode(encodeStr):
 
 
 if __name__ == "__main__":
-    print get_uuid()
-    print get_iso_8061_date()
-    print get_rfc_2616_date()
+    print(get_uuid())
+    print(get_iso_8061_date())
+    print(get_rfc_2616_date())