优化异常解析逻辑

Author: libertyzhu

qcloud_cos/cos_exception.py

@@ -1,6 +1,7 @@
 # -*- coding=utf-8
 
 import xml.dom.minidom
+from requests.structures import CaseInsensitiveDict
 
 
 class CosException(Exception):
@@ -51,7 +52,7 @@ class CosServiceError(CosException):
 
     def __init__(self, method, message, status_code):
         CosException.__init__(self, message)
-        if isinstance(message, dict):
+        if isinstance(message, dict) or isinstance(message, CaseInsensitiveDict):
             self._origin_msg = ''
             self._digest_msg = message
         else:

ut/test.py

@@ -78,6 +78,9 @@ def token(self):
     SecretKey=SECRET_KEY,
 )
 
+anonymous_conf = CosConfig(Appid=APPID, Region=REGION, Anonymous=True)
+anonymous_client = CosS3Client(anonymous_conf)
+
 client = CosS3Client(conf, retry=3)
 meta_insight_client = MetaInsightClient(metaConf, retry=3)
 ai_recognition_client = AIRecognitionClient(conf, retry=3)
@@ -6606,6 +6609,21 @@ def test_cos_client_retry_2():
     do_retry_test(client2, err_retry_bucket, 'shutdown', 1, False) 
 
 
+def test_head_exception():
+    """正确解析head请求响应的非404错误码"""
+    try:
+        anonymous_client.head_bucket(Bucket=test_bucket)
+    except CosServiceError as e:
+        assert 'x-cos-request-id' in e.get_digest_msg()
+        assert 403 == e.get_status_code()
+
+    try:
+        anonymous_client.head_object(Bucket=test_bucket, Key='foobar')
+    except CosServiceError as e:
+        assert 'x-cos-request-id' in e.get_digest_msg()
+        assert 403 == e.get_status_code()
+
+
 if __name__ == "__main__":
     setUp()
     """