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, 4 insertions, 2 deletions

diff --git a/test/test_examples.py b/test/test_examples.py
index e63f1c7a..e9bccd2e 100644
--- a/test/test_examples.py
+++ b/test/test_examples.py
@@ -11,15 +11,17 @@ def test_load_scripts():
     tmaster = tservers.TestMaster(config.ProxyConfig())
 
     for f in scripts:
-        if "har_extractor" in f:
+        if "har_extractor" in f or "flowwriter" in f:
             f += " -"
         if "iframe_injector" in f:
             f += " foo"  # one argument required
+        if "filt" in f:
+            f += " ~a"
         if "modify_response_body" in f:
             f += " foo bar"  # two arguments required
         try:
             s = script.Script(f, tmaster)  # Loads the script file.
-        except Exception, v:
+        except Exception as v:
             if not "ImportError" in str(v):
                 raise
         else: