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, 6 insertions, 7 deletions

diff --git a/test/test_fuzzing.py b/test/test_fuzzing.py
index 646ce5c1..5e5115c9 100644
--- a/test/test_fuzzing.py
+++ b/test/test_fuzzing.py
@@ -5,16 +5,17 @@ import tservers
     after being fixed to check for regressions.
 """
 
+
 class TestFuzzy(tservers.HTTPProxTest):
     def test_idna_err(self):
         req = r'get:"http://localhost:%s":i10,"\xc6"'
         p = self.pathoc()
-        assert p.request(req%self.server.port).status_code == 400
+        assert p.request(req % self.server.port).status_code == 400
 
     def test_nullbytes(self):
         req = r'get:"http://localhost:%s":i19,"\x00"'
         p = self.pathoc()
-        assert p.request(req%self.server.port).status_code == 400
+        assert p.request(req % self.server.port).status_code == 400
 
     def test_invalid_ports(self):
         req = 'get:"http://localhost:999999"'
@@ -24,16 +25,14 @@ class TestFuzzy(tservers.HTTPProxTest):
     def test_invalid_ipv6_url(self):
         req = 'get:"http://localhost:%s":i13,"["'
         p = self.pathoc()
-        assert p.request(req%self.server.port).status_code == 400
+        assert p.request(req % self.server.port).status_code == 400
 
     def test_invalid_upstream(self):
-        req = r"get:'http://localhost:%s/p/200:i10,\'+\''"
+        req = r"get:'http://localhost:%s/p/200:i10,\x27+\x27'"
         p = self.pathoc()
-        assert p.request(req%self.server.port).status_code == 502
+        assert p.request(req % self.server.port).status_code == 502
 
     def test_upstream_disconnect(self):
         req = r'200:d0'
         p = self.pathod(req)
         assert p.status_code == 502
-
-