[PEP8] PacketStream

Author: 8r2y5

packet_stream.py

@@ -6,7 +6,15 @@
 
 
 class Packet(object):
-    def __init__(self, packet_id, payload_size, data, original_data, direction, compressed=False):
+    def __init__(
+        self,
+        packet_id,
+        payload_size,
+        data,
+        original_data,
+        direction,
+        compressed=False
+    ):
         self.id = packet_id
         self.payload_size = payload_size
         self.data = data
@@ -19,7 +27,7 @@ class PacketStream(object):
     logger = logging.getLogger('starrypy.packet_stream.PacketStream')
 
     def __init__(self, protocol):
-        self._stream = ""
+        self._stream = ''
         self.id = None
         self.payload_size = None
         self.header_length = None
@@ -52,44 +60,62 @@ def start_packet(self):
                     self.compressed = True
                 else:
                     self.compressed = False
-                self.header_length = 1 + len(packets.SignedVLQ("").build(packet_header.payload_size))
+                self.header_length = 1 + len(packets.SignedVLQ('').build(
+                    packet_header.payload_size)
+                )
                 self.packet_size = self.payload_size + self.header_length
                 return True
         except RuntimeError:
-            self.logger.error("Unknown error in start_packet.")
+            self.logger.error('Unknown error in start_packet.')
             return False
 
     def check_packet(self):
         try:
-            if self.packet_size is not None and len(self._stream) >= self.packet_size:
-                p, self._stream = self._stream[:self.packet_size], self._stream[self.packet_size:]
+            if (
+                    self.packet_size is not None and
+                    len(self._stream) >= self.packet_size
+            ):
+                p = self._stream[:self.packet_size]
+                self._stream = self._stream[self.packet_size:]
                 if not self._stream:
-                    self._stream = ""
+                    self._stream = ''
                 p_parsed = packets.packet().parse(p)
                 if self.compressed:
                     try:
                         z = zlib.decompressobj()
                         p_parsed.data = z.decompress(p_parsed.data)
                     except zlib.error:
-                        self.logger.error("Decompression error in check_packet.")
-                        self.logger.debug("Parsed packet:")
+                        self.logger.error(
+                            'Decompression error in check_packet.'
+                        )
+                        self.logger.debug('Parsed packet:')
                         self.logger.debug(pprint.pformat(p_parsed))
-                        self.logger.debug("Packet data:")
-                        self.logger.debug(pprint.pformat(p_parsed.original_data.encode("hex")))
-                        self.logger.debug("Following packet data:")
-                        self.logger.debug(pprint.pformat(self._stream.encode("hex")))
+                        self.logger.debug('Packet data:')
+                        self.logger.debug(
+                            pprint.pformat(
+                                p_parsed.original_data.encode('hex')
+                            )
+                        )
+                        self.logger.debug('Following packet data:')
+                        self.logger.debug(
+                            pprint.pformat(self._stream.encode('hex'))
+                        )
                         raise
-                packet = Packet(packet_id=p_parsed.id, payload_size=p_parsed.payload_size, data=p_parsed.data,
-                                original_data=p, direction=self.direction)
+                packet = Packet(
+                    packet_id=p_parsed.id,
+                    payload_size=p_parsed.payload_size,
+                    data=p_parsed.data,
+                    original_data=p,
+                    direction=self.direction
+                )
 
                 self.compressed = False
                 self.protocol.string_received(packet)
                 self.reset()
                 if self.start_packet():
                     self.check_packet()
         except RuntimeError:
-            self.logger.error("Unknown error in check_packet")
-            #return False
+            self.logger.error('Unknown error in check_packet')
 
     def reset(self):
         self.id = None