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, 5 insertions, 44 deletions

diff --git a/test/test_console.py b/test/test_console.py
index d66bd8b0..ed8408a5 100644
--- a/test/test_console.py
+++ b/test/test_console.py
@@ -1,4 +1,7 @@
-import os, sys, mock, gc
+import os
+import sys
+import mock
+import gc
 from os.path import normpath
 import mock_urwid
 from libmproxy import console
@@ -6,6 +9,7 @@ from libmproxy.console import common
 
 import tutils
 
+
 class TestConsoleState:
     def test_flow(self):
         """
@@ -104,48 +108,5 @@ def test_format_keyvals():
     )
 
 
-class TestPathCompleter:
-    def test_lookup_construction(self):
-        c = console._PathCompleter()
-
-        cd = tutils.test_data.path("completion")
-        ca = os.path.join(cd, "a")
-        assert c.complete(ca).endswith(normpath("/completion/aaa"))
-        assert c.complete(ca).endswith(normpath("/completion/aab"))
-        c.reset()
-        ca = os.path.join(cd, "aaa")
-        assert c.complete(ca).endswith(normpath("/completion/aaa"))
-        assert c.complete(ca).endswith(normpath("/completion/aaa"))
-        c.reset()
-        assert c.complete(cd).endswith(normpath("/completion/aaa"))
-
-    def test_completion(self):
-        c = console._PathCompleter(True)
-        c.reset()
-        c.lookup = [
-            ("a", "x/a"),
-            ("aa", "x/aa"),
-        ]
-        assert c.complete("a") == "a"
-        assert c.final == "x/a"
-        assert c.complete("a") == "aa"
-        assert c.complete("a") == "a"
-
-        c = console._PathCompleter(True)
-        r = c.complete("l")
-        assert c.final.endswith(r)
-
-        c.reset()
-        assert c.complete("/nonexistent") == "/nonexistent"
-        assert c.final == "/nonexistent"
-        c.reset()
-        assert c.complete("~") != "~"
-
-        c.reset()
-        s = "thisisatotallynonexistantpathforsure"
-        assert c.complete(s) == s
-        assert c.final == s
-
-
 def test_options():
     assert console.Options(kill=True)