merge changes from #1348

Author: stj

aiobotocore/parsers.py

@@ -4,8 +4,10 @@
     BaseEventStreamParser,
     BaseJSONParser,
     BaseRestParser,
+    BaseRpcV2Parser,
     BaseXMLResponseParser,
     EC2QueryParser,
+    EventStreamCBORParser,
     EventStreamJSONParser,
     EventStreamXMLParser,
     JSONParser,
@@ -74,10 +76,6 @@ def _create_event_stream(self, response, shape):
         return AioEventStream(response['body'], shape, parser, name)
 
 
-class AioBaseCBORParser(BaseCBORParser, AioResponseParser):
-    pass
-
-
 class AioBaseXMLResponseParser(BaseXMLResponseParser, AioResponseParser):
     pass
 
@@ -94,6 +92,10 @@ class AioBaseJSONParser(BaseJSONParser, AioResponseParser):
     pass
 
 
+class AioBaseCBORParser(BaseCBORParser, AioResponseParser):
+    pass
+
+
 class AioBaseEventStreamParser(BaseEventStreamParser, AioResponseParser):
     pass
 
@@ -110,7 +112,9 @@ class AioEventStreamXMLParser(
     pass
 
 
-class AioEventStreamCBORParser(RpcV2CBORParser, AioBaseEventStreamParser):
+class AioEventStreamCBORParser(
+    EventStreamCBORParser, AioBaseEventStreamParser, AioBaseCBORParser
+):
     pass
 
 
@@ -147,19 +151,7 @@ class AioBaseRestParser(BaseRestParser, AioResponseParser):
     pass
 
 
-class AioRestJSONParser(RestJSONParser, AioBaseRestParser, AioBaseJSONParser):
-    EVENT_STREAM_PARSER_CLS = AioEventStreamJSONParser
-
-
-class AioRestXMLParser(
-    RestXMLParser, AioBaseRestParser, AioBaseXMLResponseParser
-):
-    EVENT_STREAM_PARSER_CLS = AioEventStreamXMLParser
-
-
-class AioRpcV2CBORParser(RpcV2CBORParser, AioResponseParser):
-    EVENT_STREAM_PARSER_CLS = AioEventStreamCBORParser
-
+class AioBaseRpcV2Parser(BaseRpcV2Parser, AioResponseParser):
     async def _do_parse(self, response, shape):
         parsed = {}
         if shape is not None:
@@ -176,6 +168,16 @@ async def _do_parse(self, response, shape):
             )
         return parsed
 
+
+class AioRestJSONParser(RestJSONParser, AioBaseRestParser, AioBaseJSONParser):
+    EVENT_STREAM_PARSER_CLS = AioEventStreamJSONParser
+
+
+class AioRpcV2CBORParser(
+    RpcV2CBORParser, AioBaseRpcV2Parser, AioBaseCBORParser
+):
+    EVENT_STREAM_PARSER_CLS = AioEventStreamCBORParser
+
     async def _handle_event_stream(self, response, shape, event_name):
         event_stream_shape = shape.members[event_name]
         event_stream = self._create_event_stream(response, event_stream_shape)
@@ -189,6 +191,12 @@ async def _handle_event_stream(self, response, shape, event_name):
         return parsed
 
 
+class AioRestXMLParser(
+    RestXMLParser, AioBaseRestParser, AioBaseXMLResponseParser
+):
+    EVENT_STREAM_PARSER_CLS = AioEventStreamXMLParser
+
+
 PROTOCOL_PARSERS = {
     'ec2': AioEC2QueryParser,
     'query': AioQueryParser,