Merge branch 'master' of github.com:mitmproxy/mitmproxy

1 files changed, 6 insertions, 7 deletions

diff --git a/libmproxy/protocol/tcp.py b/libmproxy/protocol/tcp.py
index df7e6692..1591eb04 100644
--- a/libmproxy/protocol/tcp.py
+++ b/libmproxy/protocol/tcp.py
@@ -32,12 +32,11 @@ class TCPHandler(ProtocolHandler):
                         if d == "":  # connection closed
                             break
                         data.write(d)
-
-                        """
-                        OpenSSL Connections have an internal buffer that might contain data altough everything is read
-                        from the socket. Thankfully, connection.pending() returns the amount of bytes in this buffer,
-                        so we can read it completely at once.
-                        """
+                        # OpenSSL Connections have an internal buffer that might
+                        # contain data altough everything is read from the socket.
+                        # Thankfully, connection.pending() returns the amount of
+                        # bytes in this buffer, so we can read it completely at
+                        # once.
                         if src.ssl_established:
                             data.write(rfile.read(src.connection.pending()))
                     else:  # no data left, but not closed yet
@@ -57,4 +56,4 @@ class TCPHandler(ProtocolHandler):
 
                 self.c.log("%s %s\r\n%s" % (direction, dst_str,data))
                 dst.wfile.write(data)
-                dst.wfile.flush()
\ No newline at end of file
+                dst.wfile.flush()