Merge pull request KscSDK#9 from liuyichen/master

金山云SDK · web-flow · commit 04f77e8e8904 · 2016-09-22T19:48:34.000+08:00
headers中封装Version， Action
diff --git a/README.rst b/README.rst
@@ -4,7 +4,6 @@ SDK 使用文档
 A low-level interface to a growing number of KSC Web Services.
 
 
-
 ----------------
 Install 安装
 ----------------
@@ -167,6 +166,30 @@ Examples 示例
 
 + 更多
 
+--------------------
+BUG FIXED 问题修正
+--------------------
+
++ CERTIFICATE_VERIFY_FAILED
+::
+
+    requests.exceptions.SSLError: [Errno 1] _ssl.c:504: error:14090086:SSL routines:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed
+
+ + 参考 `InsecurePlatformWarning <https://urllib3.readthedocs.io/en/latest/advanced-usage.html#ssl-warnings>`__ 解决方法如下
+::
+
+    pip install requests[security]
+
+ + 如 `build/temp.linux-x86_64-2.7/_openssl.c:433:30: fatal error: openssl/opensslv.h: No such file or directory` 解决方法如下
+::
+
+    yum install openssl-devel
+
+ + 如 `build/temp.linux-x86_64-2.7/_openssl.c:12:24: fatal error: pyconfig.h: No such file or directory`解决方法如下
+::
+
+    yum install python-devel
+
 --------------------
 Contact Information
 --------------------
diff --git a/kscore/parsers.py b/kscore/parsers.py
@@ -783,7 +783,9 @@ def _parse_error_from_body(self, response):
     'ec2': EC2QueryParser,
     'query': QueryParser,
     'query-json': JSONParser,
+    'kcs': JSONParser,
     'json': JSONParser,
+    'json2': JSONParser,
     'rest-json': RestJSONParser,
     'rest-xml': RestXMLParser,
 }
diff --git a/kscore/serialize.py b/kscore/serialize.py
@@ -118,12 +118,26 @@ def _create_default_request(self):
             'url_path': '/',
             'query_string': '',
             'method': self.DEFAULT_METHOD,
-            'headers': {},
+            'headers': self.headers,
             # An empty body is represented as an empty byte string.
             'body': b''
         }
         return serialized
 
+    def _serialize_not_shape(self, data, parameters):
+        pass
+
+    def _serialize_data(self, serialized, data):
+
+        serialized['body'] = data
+
+        return serialized
+
+    @property
+    def headers(self):
+
+        return {}
+
     # Some extra utility methods subclasses can use.
 
     def _timestamp_iso8601(self, value):
@@ -162,7 +176,9 @@ def _get_base64(self, value):
 
 
 class QuerySerializer(Serializer):
-
+    """
+        BASE HTTP QUERY REQUEST
+    """
     TIMESTAMP_FORMAT = 'iso8601'
 
     def serialize_to_request(self, parameters, operation_model):
@@ -172,12 +188,24 @@ def serialize_to_request(self, parameters, operation_model):
                                                         self.DEFAULT_METHOD)
         # The query serializer only deals with body params so
         # that's what we hand off the _serialize_* methods.
+
         body_params = self.MAP_TYPE()
         body_params['Action'] = operation_model.name
         body_params['Version'] = operation_model.metadata['apiVersion']
         if shape is not None:
             self._serialize(body_params, parameters, shape)
-        serialized['body'] = body_params
+        else:
+            self._serialize_not_shape(body_params, parameters)
+
+        return self._serialize_data(serialized, body_params)
+
+    def _serialize_not_shape(self, data, parameters):
+        pass
+
+    def _serialize_data(self, serialized, data):
+
+        serialized['body'] = data
+
         return serialized
 
     def _serialize(self, serialized, value, shape, prefix=''):
@@ -285,52 +313,74 @@ def _serialize_type_list(self, serialized, value, shape, prefix=''):
             self._serialize(serialized, element, element_shape, element_prefix)
 
 
-class ResJSONSerializer(QuerySerializer):
+class QueryAcceptJsonSerializer(QuerySerializer):
+
+    @property
+    def headers(self):
+        return {"Accept": 'application/json'}
+
+    def _serialize_not_shape(self, data, parameters):
+
+        data.update(parameters)
+
+    def _serialize_data(self, serialized, data):
 
-    def serialize_to_request(self, parameters, operation_model):
-        shape = operation_model.input_shape
-        serialized = self._create_default_request()
-        serialized['method'] = operation_model.http.get('method',
-                                                        self.DEFAULT_METHOD)
-        # The query serializer only deals with body params so
-        # that's what we hand off the _serialize_* methods.
-        body_params = self.MAP_TYPE()
-        body_params['Action'] = operation_model.name
-        body_params['Version'] = operation_model.metadata['apiVersion']
-        if shape is not None:
-            self._serialize(body_params, parameters, shape)
-        else:
-            body_params.update(parameters)
         if serialized['method'].lower() == "get":
             serialized['body'] = {}
-            serialized['query_string'] = body_params
+            serialized['query_string'] = data
         else:
-            serialized['body'] = body_params
+            serialized['body'] = data
+
+        return serialized
+
+
+class KCSSerializer(QueryAcceptJsonSerializer):
+
+    def _serialize_data(self, serialized, data):
 
-        serialized['headers'].update(Accept='application/json')
+        serialized['body'] = {}
+
+        serialized['query_string'] = data
 
         return serialized
 
 
 class JSONSerializer(Serializer):
+    """
+        BASE JSON REQUEST all method with json body
+    """
     TIMESTAMP_FORMAT = 'unixtimestamp'
 
     def serialize_to_request(self, parameters, operation_model):
         target = '%s.%s' % (operation_model.metadata['targetPrefix'],
                             operation_model.name)
-        json_version = operation_model.metadata['jsonVersion']
         serialized = self._create_default_request()
         serialized['method'] = operation_model.http.get('method',
                                                         self.DEFAULT_METHOD)
+
+        serialized['query_string'] = self.MAP_TYPE(
+            Action=operation_model.name, Version=operation_model.metadata['apiVersion']
+        )
+
         serialized['headers'] = {
             'X-Amz-Target': target,
-            'Content-Type': 'application/x-amz-json-%s' % json_version,
+            'Content-Type': 'application/json',
+            'Accept': 'application/json',
+
         }
         body = {}
         input_shape = operation_model.input_shape
         if input_shape is not None:
             self._serialize(body, parameters, input_shape)
-        serialized['body'] = json.dumps(body).encode(self.DEFAULT_ENCODING)
+        else:
+            self._serialize_not_shape(body, parameters)
+        return self._serialize_data(serialized, body)
+
+    def _serialize_not_shape(self, data, parameters):
+        data.update(parameters)
+
+    def _serialize_data(self, serialized, data):
+        serialized['body'] = json.dumps(data).encode(self.DEFAULT_ENCODING)
         return serialized
 
     def _serialize(self, serialized, value, shape, key=None):
@@ -383,21 +433,14 @@ def _serialize_type_blob(self, serialized, value, shape, key):
         serialized[key] = self._get_base64(value)
 
 
-class KSJSONSerializer(JSONSerializer):
+class NotGetJsonSerializer(JSONSerializer):
 
-    def serialize_to_request(self, parameters, operation_model):
-        serialized = JSONSerializer.serialize_to_request(self, parameters, operation_model)
-        query_params = self.MAP_TYPE()
-        query_params['Action'] = operation_model.name
-        query_params['Version'] = operation_model.metadata['apiVersion']
-        serialized['query_string'] = query_params
-        headers = {'Content-Type': 'application/json', 'Accept': 'application/json'}
-        serialized['headers'].update(headers)
-        body = {}
-        input_shape = operation_model.input_shape
-        if input_shape is not None:
-            self._serialize(body, parameters, input_shape)
-        serialized['body'] = json.dumps(body).encode(self.DEFAULT_ENCODING)
+    def _serialize_data(self, serialized, data):
+        if serialized['method'].lower() == "get":
+            serialized['body'] = {}
+            serialized['query_string'].update(data)
+        else:
+            serialized['body'] = json.dumps(data).encode(self.DEFAULT_ENCODING)
         return serialized
 
 
@@ -664,10 +707,12 @@ def _default_serialize(self, xmlnode, params, shape, name):
 
 
 SERIALIZERS = {
+    'kcs': KCSSerializer,
     'ec2': EC2Serializer,
     'query': QuerySerializer,
-    'query-json': ResJSONSerializer,
-    'json': KSJSONSerializer,
+    'query-json': QueryAcceptJsonSerializer,
+    'json': JSONSerializer,
+    'json2': NotGetJsonSerializer,
     'rest-json': RestJSONSerializer,
     'rest-xml': RestXMLSerializer,
 }
