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

diff --git a/test/test_filt.py b/test/test_filt.py
index 279f550f..3ad17dfe 100644
--- a/test/test_filt.py
+++ b/test/test_filt.py
@@ -1,9 +1,11 @@
 import cStringIO
+from netlib import odict
 from libmproxy import filt, flow
 from libmproxy.protocol import http
 from libmproxy.protocol.primitives import Error
 import tutils
 
+
 class TestParsing:
     def _dump(self, x):
         c = cStringIO.StringIO()
@@ -74,7 +76,7 @@ class TestParsing:
 
 class TestMatching:
     def req(self):
-        headers = flow.ODictCaseless()
+        headers = odict.ODictCaseless()
         headers["header"] = ["qvalue"]
         req = http.HTTPRequest(
             "absolute",
@@ -96,9 +98,17 @@ class TestMatching:
     def resp(self):
         f = self.req()
 
-        headers = flow.ODictCaseless()
+        headers = odict.ODictCaseless()
         headers["header_response"] = ["svalue"]
-        f.response = http.HTTPResponse((1, 1), 200, "OK", headers, "content_response", None, None)
+        f.response = http.HTTPResponse(
+            (1,
+             1),
+            200,
+            "OK",
+            headers,
+            "content_response",
+            None,
+            None)
 
         return f
 
@@ -253,4 +263,3 @@ class TestMatching:
         assert self.q("! ~c 201", s)
         assert self.q("!~c 201 !~c 202", s)
         assert not self.q("!~c 201 !~c 200", s)
-