Merge remote-tracking branch 'upstream/master' into print-bracket-fix

Conflicts:
	examples/har_extractor.py
	examples/nonblocking.py
	examples/read_dumpfile
	libmproxy/web/app.py

1 files changed, 8 insertions, 0 deletions

diff --git a/test/scripts/all.py b/test/scripts/all.py
index 3acaf694..dad2aade 100644
--- a/test/scripts/all.py
+++ b/test/scripts/all.py
@@ -1,28 +1,36 @@
 log = []
+
+
 def clientconnect(ctx, cc):
     ctx.log("XCLIENTCONNECT")
     log.append("clientconnect")
 
+
 def serverconnect(ctx, cc):
     ctx.log("XSERVERCONNECT")
     log.append("serverconnect")
 
+
 def request(ctx, f):
     ctx.log("XREQUEST")
     log.append("request")
 
+
 def response(ctx, f):
     ctx.log("XRESPONSE")
     log.append("response")
 
+
 def responseheaders(ctx, f):
     ctx.log("XRESPONSEHEADERS")
     log.append("responseheaders")
 
+
 def clientdisconnect(ctx, cc):
     ctx.log("XCLIENTDISCONNECT")
     log.append("clientdisconnect")
 
+
 def error(ctx, cc):
     ctx.log("XERROR")
     log.append("error")