kingsoftcloud-sdk-python 1.5.8.44__py2.py3-none-any.whl → 1.5.8.49__py2.py3-none-any.whl

ksyun/client/vpc/v20160304/models.py

@@ -12,10 +12,13 @@ class CreateVpcRequest(AbstractModel):
         :type PathPrefix: String
         :param ProvidedIpv6CidrBlock: 是否支持IPv6网段，目前只支持部分机房
         :type PathPrefix: Boolean
+        :param Ipv6CidrBlock: Ipv6CidrBlock指定ipv6网段创建vpc，只有当ProvidedIpv6CidrBlock = true时生效，该参数可不传，不传则随机分配ipv6网段
+        :type PathPrefix: String
         """
         self.VpcName = None
         self.CidrBlock = None
         self.ProvidedIpv6CidrBlock = None
+        self.Ipv6CidrBlock = None
 
     def _deserialize(self, params):
         if params.get("VpcName"):
@@ -24,6 +27,8 @@ class CreateVpcRequest(AbstractModel):
             self.CidrBlock = params.get("CidrBlock")
         if params.get("ProvidedIpv6CidrBlock"):
             self.ProvidedIpv6CidrBlock = params.get("ProvidedIpv6CidrBlock")
+        if params.get("Ipv6CidrBlock"):
+            self.Ipv6CidrBlock = params.get("Ipv6CidrBlock")
 
 
 class DeleteVpcRequest(AbstractModel):

ksyun/client/waf/v20200707/client.py

@@ -28,7 +28,7 @@ class WafClient(AbstractClient):
             if isinstance(e, KsyunSDKException):
                 raise
             else:
-                raise KsyunSDKException(e.message, e.message)
+                raise KsyunSDKException(message=str(e))
 
 
     def DeleteWaf(self, request):
@@ -51,7 +51,7 @@ class WafClient(AbstractClient):
             if isinstance(e, KsyunSDKException):
                 raise
             else:
-                raise KsyunSDKException(e.message, e.message)
+                raise KsyunSDKException(message=str(e))
 
 
     def CreateDomain(self, request):
@@ -74,7 +74,7 @@ class WafClient(AbstractClient):
             if isinstance(e, KsyunSDKException):
                 raise
             else:
-                raise KsyunSDKException(e.message, e.message)
+                raise KsyunSDKException(message=str(e))
 
 
     def DescribeDomains(self, request):
@@ -97,7 +97,7 @@ class WafClient(AbstractClient):
             if isinstance(e, KsyunSDKException):
                 raise
             else:
-                raise KsyunSDKException(e.message, e.message)
+                raise KsyunSDKException(message=str(e))
 
 
     def ModifyDomain(self, request):
@@ -120,7 +120,7 @@ class WafClient(AbstractClient):
             if isinstance(e, KsyunSDKException):
                 raise
             else:
-                raise KsyunSDKException(e.message, e.message)
+                raise KsyunSDKException(message=str(e))
 
 
     def DeleteDomain(self, request):
@@ -143,7 +143,7 @@ class WafClient(AbstractClient):
             if isinstance(e, KsyunSDKException):
                 raise
             else:
-                raise KsyunSDKException(e.message, e.message)
+                raise KsyunSDKException(message=str(e))
 
 
     def CreateAccessControlRule(self, request):
@@ -166,7 +166,7 @@ class WafClient(AbstractClient):
             if isinstance(e, KsyunSDKException):
                 raise
             else:
-                raise KsyunSDKException(e.message, e.message)
+                raise KsyunSDKException(message=str(e))
 
 
     def DescribeAccessControlRules(self, request):
@@ -189,7 +189,7 @@ class WafClient(AbstractClient):
             if isinstance(e, KsyunSDKException):
                 raise
             else:
-                raise KsyunSDKException(e.message, e.message)
+                raise KsyunSDKException(message=str(e))
 
 
     def ModifyAccessControlRule(self, request):
@@ -212,7 +212,7 @@ class WafClient(AbstractClient):
             if isinstance(e, KsyunSDKException):
                 raise
             else:
-                raise KsyunSDKException(e.message, e.message)
+                raise KsyunSDKException(message=str(e))
 
 
     def DeleteAccessControlRule(self, request):
@@ -235,7 +235,7 @@ class WafClient(AbstractClient):
             if isinstance(e, KsyunSDKException):
                 raise
             else:
-                raise KsyunSDKException(e.message, e.message)
+                raise KsyunSDKException(message=str(e))
 
 
     def DescribeCertificates(self, request):
@@ -258,7 +258,7 @@ class WafClient(AbstractClient):
             if isinstance(e, KsyunSDKException):
                 raise
             else:
-                raise KsyunSDKException(e.message, e.message)
+                raise KsyunSDKException(message=str(e))
 
 
     def CreateIpv6Protection(self, request):
@@ -281,7 +281,7 @@ class WafClient(AbstractClient):
             if isinstance(e, KsyunSDKException):
                 raise
             else:
-                raise KsyunSDKException(e.message, e.message)
+                raise KsyunSDKException(message=str(e))
 
 
     def DeleteIpv6Protection(self, request):
@@ -304,7 +304,7 @@ class WafClient(AbstractClient):
             if isinstance(e, KsyunSDKException):
                 raise
             else:
-                raise KsyunSDKException(e.message, e.message)
+                raise KsyunSDKException(message=str(e))
 
 
     def ModifyStorageTime(self, request):
@@ -327,7 +327,7 @@ class WafClient(AbstractClient):
             if isinstance(e, KsyunSDKException):
                 raise
             else:
-                raise KsyunSDKException(e.message, e.message)
+                raise KsyunSDKException(message=str(e))
 
 
     def CreateAlbDomain(self, request):
@@ -350,7 +350,7 @@ class WafClient(AbstractClient):
             if isinstance(e, KsyunSDKException):
                 raise
             else:
-                raise KsyunSDKException(e.message, e.message)
+                raise KsyunSDKException(message=str(e))
 
 
     def ModifyAlbDomain(self, request):
@@ -373,7 +373,7 @@ class WafClient(AbstractClient):
             if isinstance(e, KsyunSDKException):
                 raise
             else:
-                raise KsyunSDKException(e.message, e.message)
+                raise KsyunSDKException(message=str(e))
 
 
     def DeleteAlbDomain(self, request):
@@ -396,7 +396,7 @@ class WafClient(AbstractClient):
             if isinstance(e, KsyunSDKException):
                 raise
             else:
-                raise KsyunSDKException(e.message, e.message)
+                raise KsyunSDKException(message=str(e))
 
 
     def CreateAlbWaf(self, request):
@@ -419,7 +419,7 @@ class WafClient(AbstractClient):
             if isinstance(e, KsyunSDKException):
                 raise
             else:
-                raise KsyunSDKException(e.message, e.message)
+                raise KsyunSDKException(message=str(e))
 
 
     def ModifyAlbWaf(self, request):
@@ -442,7 +442,7 @@ class WafClient(AbstractClient):
             if isinstance(e, KsyunSDKException):
                 raise
             else:
-                raise KsyunSDKException(e.message, e.message)
+                raise KsyunSDKException(message=str(e))
 
 
     def DescribeAlbDomains(self, request):
@@ -465,6 +465,4 @@ class WafClient(AbstractClient):
             if isinstance(e, KsyunSDKException):
                 raise
             else:
-                raise KsyunSDKException(e.message, e.message)
-
-
+                raise KsyunSDKException(message=str(e))

ksyun/common/abstract_client.py

@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import unicode_literals, print_function
 import copy
 import json
 import sys
@@ -21,6 +22,7 @@ import uuid
 import warnings
 import logging
 import logging.handlers
+import six
 
 try:
     from urllib.parse import urlencode
@@ -211,9 +213,19 @@ class AbstractClient(object):
                 if isinstance(v, list) or isinstance(v, dict):
                     v = json.dumps(v)
                     body += b'Content-Type: application/json\r\n'
-            if sys.version_info[0] == 3 and isinstance(v, type("")):
-                v = v.encode()
-            body += b'\r\n%s\r\n' % v
+            # Python 2/3 compatible: convert any non-bytes value to bytes
+            if isinstance(v, six.binary_type):
+                # Already bytes
+                pass
+            elif isinstance(v, six.text_type):
+                # Unicode/str text -> bytes
+                v = v.encode('utf-8')
+            else:
+                # Numbers, None, etc. -> str -> bytes
+                v = str(v).encode('utf-8')
+            # Concatenate bytes
+            body += v
+            body += b'\r\n'
         if body != b'':
             body += b'--%s--\r\n' % boundary
         return body

ksyun/common/abstract_model.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import unicode_literals
 import json
 import sys
 
@@ -31,10 +32,9 @@ class AbstractModel(object):
                     if isinstance(tem, AbstractModel):
                         r.append(tem._serialize(allow_none))
                     else:
-                        r.append(
-                            tem.encode("UTF-8") if isinstance(tem, type(u"")) and sys.version_info[0] == 2 else tem)
+                        r.append(tem)
             else:
-                r = d[k].encode("UTF-8") if isinstance(d[k], type(u"")) and sys.version_info[0] == 2 else d[k]
+                r = d[k]
             if allow_none or r is not None:
                 ret[k[0].upper() + k[1:]] = r
         return ret

ksyun/common/common_client.py

@@ -14,6 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import unicode_literals
+
 from ksyun.common.abstract_client import AbstractClient
 from ksyun.common.exception.ksyun_sdk_exception import KsyunSDKException
 

ksyun/common/credential.py

@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import unicode_literals
+
 try:
     # py3
     import configparser

ksyun/common/exception/ksyun_sdk_exception.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
 import sys
 
 
@@ -8,17 +9,20 @@ class KsyunSDKException(Exception):
 
     def __init__(self, code=None, message=None, requestId=None):
         self.code = code
-        self.message = message
+        self.message = message or str(code)
         self.requestId = requestId
+        # Python 2/3 compatible super() call
+        if sys.version_info[0] >= 3:
+            super().__init__(self.message)
+        else:
+            super(KsyunSDKException, self).__init__(self.message)
 
     def __str__(self):
-        s = "[KsyunSDKException] code:%s message:%s requestId:%s" % (
-            self.code, self.message, self.requestId)
-        if sys.version_info[0] < 3 and isinstance(s, unicode):
-            return s.encode("utf8")
-        else:
-            return s
+        return "[KsyunSDKException] code:%s message:%s requestId:%s" % (
+            self.code, self.message, self.requestId
+        )
 
+    # 保证与旧版本代码兼容，保留原有方法名
     def get_code(self):
         return self.code
 

ksyun/common/http/request.py

@@ -1,6 +1,8 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
+from __future__ import unicode_literals
+
 import os
 import logging
 import requests

ksyun/common/profile/client_profile.py

@@ -11,6 +11,9 @@
 # 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.
+
+from __future__ import unicode_literals
+
 from ksyun.common.exception.ksyun_sdk_exception import KsyunSDKException
 from ksyun.common.profile.http_profile import HttpProfile
 

ksyun/common/profile/http_profile.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import unicode_literals
+
 
 class HttpProfile(object):
     scheme = "https"