minor fixes

libmproxy/protocol/http.py

@@ -940,7 +940,7 @@ class HTTPHandler(ProtocolHandler):
                     # > send large request upstream
                     self.c.server_reconnect()
                 else:
-                    raise v
+                    raise
 
     def handle_flow(self):
         flow = HTTPFlow(self.c.client_conn, self.c.server_conn, self.live)
@@ -1078,7 +1078,7 @@ class HTTPHandler(ProtocolHandler):
             if flow.request and not flow.response:
                 self.c.channel.ask("error", flow.error)
         else:
-            pass  # FIXME: Do we want to persist errors without flows?
+            pass
 
         try:
             self.send_error(code, message, headers)

libmproxy/proxy/primitives.py

@@ -3,7 +3,7 @@ from __future__ import absolute_import
 
 class ProxyError(Exception):
     def __init__(self, code, message, headers=None):
-        super(ProxyError, self).__init__(self, message)
+        super(ProxyError, self).__init__(message)
         self.code, self.headers = code, headers
 
 

libmproxy/proxy/server.py

@@ -279,5 +279,4 @@ class ConnectionHandler:
         # make dang sure it doesn't happen.
         except Exception:  # pragma: no cover
             import traceback
-
             self.log("Error in handle_sni:\r\n" + traceback.format_exc(), "error")