fix all libmproxy->mitmproxy references

27 files changed, 70 insertions, 70 deletions

diff --git a/test/mitmproxy/scripts/concurrent_decorator.py b/test/mitmproxy/scripts/concurrent_decorator.py
index f6feda1d..6651c811 100644
--- a/test/mitmproxy/scripts/concurrent_decorator.py
+++ b/test/mitmproxy/scripts/concurrent_decorator.py
@@ -1,5 +1,5 @@
 import time
-from libmproxy.script import concurrent
+from mitmproxy.script import concurrent
 
 
 @concurrent
diff --git a/test/mitmproxy/scripts/concurrent_decorator_err.py b/test/mitmproxy/scripts/concurrent_decorator_err.py
index 00fd8dad..071b8889 100644
--- a/test/mitmproxy/scripts/concurrent_decorator_err.py
+++ b/test/mitmproxy/scripts/concurrent_decorator_err.py
@@ -1,4 +1,4 @@
-from libmproxy.script import concurrent
+from mitmproxy.script import concurrent
 
 
 @concurrent
diff --git a/test/mitmproxy/test_cmdline.py b/test/mitmproxy/test_cmdline.py
index 9b3317aa..5a70f3e0 100644
--- a/test/mitmproxy/test_cmdline.py
+++ b/test/mitmproxy/test_cmdline.py
@@ -1,5 +1,5 @@
 import argparse
-from libmproxy import cmdline
+from mitmproxy import cmdline
 from . import tutils
 
 
diff --git a/test/mitmproxy/test_console.py b/test/mitmproxy/test_console.py
index e64ed44a..58a812a6 100644
--- a/test/mitmproxy/test_console.py
+++ b/test/mitmproxy/test_console.py
@@ -1,8 +1,8 @@
 import gc
 
 import netlib.tutils
-from libmproxy import console
-from libmproxy.console import common
+from mitmproxy import console
+from mitmproxy.console import common
 
 from . import tutils
 
diff --git a/test/mitmproxy/test_console_common.py b/test/mitmproxy/test_console_common.py
index deba5f6c..219200e0 100644
--- a/test/mitmproxy/test_console_common.py
+++ b/test/mitmproxy/test_console_common.py
@@ -4,7 +4,7 @@ if os.name == "nt":
     raise SkipTest("Skipped on Windows.")
 
 
-import libmproxy.console.common as common
+import mitmproxy.console.common as common
 from . import tutils
 
 
diff --git a/test/mitmproxy/test_console_help.py b/test/mitmproxy/test_console_help.py
index f1a71faf..0589bd68 100644
--- a/test/mitmproxy/test_console_help.py
+++ b/test/mitmproxy/test_console_help.py
@@ -3,7 +3,7 @@ from unittest.case import SkipTest
 if os.name == "nt":
     raise SkipTest("Skipped on Windows.")
 
-import libmproxy.console.help as help
+import mitmproxy.console.help as help
 
 
 class TestHelp:
diff --git a/test/mitmproxy/test_console_palettes.py b/test/mitmproxy/test_console_palettes.py
index ac33f83d..b5d84ddd 100644
--- a/test/mitmproxy/test_console_palettes.py
+++ b/test/mitmproxy/test_console_palettes.py
@@ -2,7 +2,7 @@ import os
 from unittest.case import SkipTest
 if os.name == "nt":
     raise SkipTest("Skipped on Windows.")
-import libmproxy.console.palettes as palettes
+import mitmproxy.console.palettes as palettes
 
 
 class TestPalette:
diff --git a/test/mitmproxy/test_console_pathedit.py b/test/mitmproxy/test_console_pathedit.py
index 940351f5..e2c27b7c 100644
--- a/test/mitmproxy/test_console_pathedit.py
+++ b/test/mitmproxy/test_console_pathedit.py
@@ -1,6 +1,6 @@
 import os
 from os.path import normpath
-from libmproxy.console import pathedit
+from mitmproxy.console import pathedit
 
 from . import tutils
 
diff --git a/test/mitmproxy/test_contentview.py b/test/mitmproxy/test_contentview.py
index af80d63a..7f1d735e 100644
--- a/test/mitmproxy/test_contentview.py
+++ b/test/mitmproxy/test_contentview.py
@@ -1,9 +1,9 @@
-from libmproxy.exceptions import ContentViewException
+from mitmproxy.exceptions import ContentViewException
 from netlib.http import Headers
 import netlib.utils
 from netlib import encoding
 
-import libmproxy.contentviews as cv
+import mitmproxy.contentviews as cv
 from . import tutils
 
 try:
diff --git a/test/mitmproxy/test_controller.py b/test/mitmproxy/test_controller.py
index ffc7d433..eb3f7df4 100644
--- a/test/mitmproxy/test_controller.py
+++ b/test/mitmproxy/test_controller.py
@@ -1,5 +1,5 @@
 import mock
-from libmproxy import controller
+from mitmproxy import controller
 
 
 class TestMaster:
diff --git a/test/mitmproxy/test_custom_contentview.py b/test/mitmproxy/test_custom_contentview.py
index adc4109b..479b0b43 100644
--- a/test/mitmproxy/test_custom_contentview.py
+++ b/test/mitmproxy/test_custom_contentview.py
@@ -1,4 +1,4 @@
-import libmproxy.contentviews as cv
+import mitmproxy.contentviews as cv
 from netlib.http import Headers
 
 
diff --git a/test/mitmproxy/test_dump.py b/test/mitmproxy/test_dump.py
index dbd0c653..3588a73f 100644
--- a/test/mitmproxy/test_dump.py
+++ b/test/mitmproxy/test_dump.py
@@ -1,13 +1,13 @@
 import os
 from cStringIO import StringIO
-from libmproxy.exceptions import ContentViewException
-from libmproxy.models import HTTPResponse
+from mitmproxy.exceptions import ContentViewException
+from mitmproxy.models import HTTPResponse
 
 import netlib.tutils
 from netlib.http import CONTENT_MISSING
 
-from libmproxy import dump, flow
-from libmproxy.proxy import Log
+from mitmproxy import dump, flow
+from mitmproxy.proxy import Log
 from . import tutils
 import mock
 
@@ -49,7 +49,7 @@ def test_strfuncs():
     m.echo_flow(flow)
 
 
-@mock.patch("libmproxy.contentviews.get_content_view")
+@mock.patch("mitmproxy.contentviews.get_content_view")
 def test_contentview(get_content_view):
     get_content_view.side_effect = ContentViewException(""), ("x", iter([]))
 
diff --git a/test/mitmproxy/test_examples.py b/test/mitmproxy/test_examples.py
index bb7c596b..6920c8e9 100644
--- a/test/mitmproxy/test_examples.py
+++ b/test/mitmproxy/test_examples.py
@@ -1,11 +1,11 @@
 import glob
-from libmproxy import utils, script
-from libmproxy.proxy import config
+from mitmproxy import utils, script
+from mitmproxy.proxy import config
 from . import tservers
 
 
 def test_load_scripts():
-    example_dir = utils.Data("libmproxy").path("../examples")
+    example_dir = utils.Data("mitmproxy").path("../examples")
     scripts = glob.glob("%s/*.py" % example_dir)
 
     tmaster = tservers.TestMaster(config.ProxyConfig())
diff --git a/test/mitmproxy/test_filt.py b/test/mitmproxy/test_filt.py
index e6873c7d..0ea635e7 100644
--- a/test/mitmproxy/test_filt.py
+++ b/test/mitmproxy/test_filt.py
@@ -1,7 +1,7 @@
 import cStringIO
-from libmproxy import filt
-from libmproxy.models import Error
-from libmproxy.models import http
+from mitmproxy import filt
+from mitmproxy.models import Error
+from mitmproxy.models import http
 from netlib.http import Headers
 from . import tutils
 
diff --git a/test/mitmproxy/test_flow.py b/test/mitmproxy/test_flow.py
index b122489f..a593c8c3 100644
--- a/test/mitmproxy/test_flow.py
+++ b/test/mitmproxy/test_flow.py
@@ -9,16 +9,16 @@ import mock
 import netlib.utils
 from netlib import odict
 from netlib.http import CONTENT_MISSING, Headers
-from libmproxy import filt, controller, tnetstring, flow
-from libmproxy.models import Error
-from libmproxy.models import Flow
-from libmproxy.models import HTTPFlow
-from libmproxy.models import HTTPRequest
-from libmproxy.models import HTTPResponse
-from libmproxy.proxy.config import HostMatcher
-from libmproxy.proxy import ProxyConfig
-from libmproxy.proxy.server import DummyServer
-from libmproxy.models.connections import ClientConnection
+from mitmproxy import filt, controller, tnetstring, flow
+from mitmproxy.models import Error
+from mitmproxy.models import Flow
+from mitmproxy.models import HTTPFlow
+from mitmproxy.models import HTTPRequest
+from mitmproxy.models import HTTPResponse
+from mitmproxy.proxy.config import HostMatcher
+from mitmproxy.proxy import ProxyConfig
+from mitmproxy.proxy.server import DummyServer
+from mitmproxy.models.connections import ClientConnection
 from . import tutils
 
 
diff --git a/test/mitmproxy/test_flow_export.py b/test/mitmproxy/test_flow_export.py
index e5e9c0a3..2dce3fd6 100644
--- a/test/mitmproxy/test_flow_export.py
+++ b/test/mitmproxy/test_flow_export.py
@@ -1,7 +1,7 @@
 from textwrap import dedent
 
 import netlib.tutils
-from libmproxy import flow_export
+from mitmproxy import flow_export
 from . import tutils
 
 req_get = netlib.tutils.treq(
diff --git a/test/mitmproxy/test_flow_format_compat.py b/test/mitmproxy/test_flow_format_compat.py
index 232f5473..7a0694e1 100644
--- a/test/mitmproxy/test_flow_format_compat.py
+++ b/test/mitmproxy/test_flow_format_compat.py
@@ -1,4 +1,4 @@
-from libmproxy.flow import FlowReader, FlowReadError
+from mitmproxy.flow import FlowReader, FlowReadError
 from . import tutils
 
 
diff --git a/test/mitmproxy/test_platform_pf.py b/test/mitmproxy/test_platform_pf.py
index 8994ee0d..5082fafb 100644
--- a/test/mitmproxy/test_platform_pf.py
+++ b/test/mitmproxy/test_platform_pf.py
@@ -1,5 +1,5 @@
 import sys
-from libmproxy.platform import pf
+from mitmproxy.platform import pf
 from . import tutils
 
 
diff --git a/test/mitmproxy/test_protocol_http2.py b/test/mitmproxy/test_protocol_http2.py
index 6d3bb43f..fc27cc3f 100644
--- a/test/mitmproxy/test_protocol_http2.py
+++ b/test/mitmproxy/test_protocol_http2.py
@@ -6,8 +6,8 @@ import traceback
 import os
 import tempfile
 
-from libmproxy.proxy.config import ProxyConfig
-from libmproxy.cmdline import APP_HOST, APP_PORT
+from mitmproxy.proxy.config import ProxyConfig
+from mitmproxy.cmdline import APP_HOST, APP_PORT
 
 import logging
 logging.getLogger("hyper.packages.hpack.hpack").setLevel(logging.WARNING)
diff --git a/test/mitmproxy/test_proxy.py b/test/mitmproxy/test_proxy.py
index 27ae70a8..9c4a6604 100644
--- a/test/mitmproxy/test_proxy.py
+++ b/test/mitmproxy/test_proxy.py
@@ -2,11 +2,11 @@ import os
 import mock
 from OpenSSL import SSL
 
-from libmproxy import cmdline
-from libmproxy.proxy import ProxyConfig
-from libmproxy.proxy.config import process_proxy_options
-from libmproxy.models.connections import ServerConnection
-from libmproxy.proxy.server import DummyServer, ProxyServer, ConnectionHandler
+from mitmproxy import cmdline
+from mitmproxy.proxy import ProxyConfig
+from mitmproxy.proxy.config import process_proxy_options
+from mitmproxy.models.connections import ServerConnection
+from mitmproxy.proxy.server import DummyServer, ProxyServer, ConnectionHandler
 from netlib.exceptions import TcpDisconnect
 from libpathod import test
 from netlib.http import http1
@@ -76,11 +76,11 @@ class TestProcessProxyOptions:
         with tutils.tmpdir() as cadir:
             self.assert_noerr("--cadir", cadir)
 
-    @mock.patch("libmproxy.platform.resolver", None)
+    @mock.patch("mitmproxy.platform.resolver", None)
     def test_no_transparent(self):
         self.assert_err("transparent mode not supported", "-T")
 
-    @mock.patch("libmproxy.platform.resolver")
+    @mock.patch("mitmproxy.platform.resolver")
     def test_modes(self, _):
         self.assert_noerr("-R", "http://localhost")
         self.assert_err("expected one argument", "-R")
diff --git a/test/mitmproxy/test_script.py b/test/mitmproxy/test_script.py
index f3a6499e..b827c623 100644
--- a/test/mitmproxy/test_script.py
+++ b/test/mitmproxy/test_script.py
@@ -1,7 +1,7 @@
 import os
 import time
 import mock
-from libmproxy import script, flow
+from mitmproxy import script, flow
 from . import tutils
 
 
@@ -68,7 +68,7 @@ def test_concurrent():
     fm = flow.FlowMaster(None, s)
     fm.load_script(tutils.test_data.path("scripts/concurrent_decorator.py"))
 
-    with mock.patch("libmproxy.controller.DummyReply.__call__") as m:
+    with mock.patch("mitmproxy.controller.DummyReply.__call__") as m:
         f1, f2 = tutils.tflow(), tutils.tflow()
         t_start = time.time()
         fm.handle_request(f1)
diff --git a/test/mitmproxy/test_server.py b/test/mitmproxy/test_server.py
index 1b7e6966..3d65659f 100644
--- a/test/mitmproxy/test_server.py
+++ b/test/mitmproxy/test_server.py
@@ -12,9 +12,9 @@ from netlib.http import authentication, CONTENT_MISSING, http1
 from netlib.tutils import raises
 from libpathod import pathoc, pathod
 
-from libmproxy.proxy.config import HostMatcher
-from libmproxy.protocol import Kill
-from libmproxy.models import Error, HTTPResponse
+from mitmproxy.proxy.config import HostMatcher
+from mitmproxy.protocol import Kill
+from mitmproxy.models import Error, HTTPResponse
 
 from . import tutils, tservers
 
diff --git a/test/mitmproxy/test_utils.py b/test/mitmproxy/test_utils.py
index 17bf3dbf..ae6369ae 100644
--- a/test/mitmproxy/test_utils.py
+++ b/test/mitmproxy/test_utils.py
@@ -1,5 +1,5 @@
 import json
-from libmproxy import utils
+from mitmproxy import utils
 from . import tutils
 
 utils.CERT_SLEEP_TIME = 0
diff --git a/test/mitmproxy/tools/benchtool.py b/test/mitmproxy/tools/benchtool.py
index a1d80697..17043676 100644
--- a/test/mitmproxy/tools/benchtool.py
+++ b/test/mitmproxy/tools/benchtool.py
@@ -5,7 +5,7 @@
 # - Apache Bench "ab" binary
 # - pip install click yappi
 
-from libmproxy.main import mitmdump
+from mitmproxy.main import mitmdump
 from os import system
 from threading import Thread
 import time
diff --git a/test/mitmproxy/tools/inspect_dumpfile.py b/test/mitmproxy/tools/inspect_dumpfile.py
index d15e9e8a..b2201f40 100644
--- a/test/mitmproxy/tools/inspect_dumpfile.py
+++ b/test/mitmproxy/tools/inspect_dumpfile.py
@@ -2,7 +2,7 @@ from pprint import pprint
 
 import click
 
-from libmproxy import tnetstring
+from mitmproxy import tnetstring
 
 
 def read_tnetstring(input):
diff --git a/test/mitmproxy/tservers.py b/test/mitmproxy/tservers.py
index dbc9f7d0..df4a2f2d 100644
--- a/test/mitmproxy/tservers.py
+++ b/test/mitmproxy/tservers.py
@@ -4,12 +4,12 @@ import tempfile
 import flask
 import mock
 
-from libmproxy.proxy.config import ProxyConfig
-from libmproxy.proxy.server import ProxyServer
+from mitmproxy.proxy.config import ProxyConfig
+from mitmproxy.proxy.server import ProxyServer
 import libpathod.test
 import libpathod.pathoc
-from libmproxy import flow, controller
-from libmproxy.cmdline import APP_HOST, APP_PORT
+from mitmproxy import flow, controller
+from mitmproxy.cmdline import APP_HOST, APP_PORT
 
 testapp = flask.Flask(__name__)
 
@@ -192,7 +192,7 @@ class TransparentProxTest(ProxTestBase):
         super(TransparentProxTest, cls).setup_class()
 
         cls._resolver = mock.patch(
-            "libmproxy.platform.resolver",
+            "mitmproxy.platform.resolver",
             new=lambda: cls.resolver(cls.server.port)
         )
         cls._resolver.start()
diff --git a/test/mitmproxy/tutils.py b/test/mitmproxy/tutils.py
index 2ce0884d..edcdf3e2 100644
--- a/test/mitmproxy/tutils.py
+++ b/test/mitmproxy/tutils.py
@@ -9,8 +9,8 @@ from contextlib import contextmanager
 from unittest.case import SkipTest
 
 import netlib.tutils
-from libmproxy import utils, controller
-from libmproxy.models import (
+from mitmproxy import utils, controller
+from mitmproxy.models import (
     ClientConnection, ServerConnection, Error, HTTPRequest, HTTPResponse, HTTPFlow
 )
 
@@ -39,12 +39,12 @@ def skip_appveyor(fn):
 
 def tflow(client_conn=True, server_conn=True, req=True, resp=None, err=None):
     """
-    @type client_conn: bool | None | libmproxy.proxy.connection.ClientConnection
-    @type server_conn: bool | None | libmproxy.proxy.connection.ServerConnection
-    @type req:         bool | None | libmproxy.protocol.http.HTTPRequest
-    @type resp:        bool | None | libmproxy.protocol.http.HTTPResponse
-    @type err:         bool | None | libmproxy.protocol.primitives.Error
-    @return:           bool | None | libmproxy.protocol.http.HTTPFlow
+    @type client_conn: bool | None | mitmproxy.proxy.connection.ClientConnection
+    @type server_conn: bool | None | mitmproxy.proxy.connection.ServerConnection
+    @type req:         bool | None | mitmproxy.protocol.http.HTTPRequest
+    @type resp:        bool | None | mitmproxy.protocol.http.HTTPResponse
+    @type err:         bool | None | mitmproxy.protocol.primitives.Error
+    @return:           bool | None | mitmproxy.protocol.http.HTTPFlow
     """
     if client_conn is True:
         client_conn = tclient_conn()
@@ -72,7 +72,7 @@ def tflow(client_conn=True, server_conn=True, req=True, resp=None, err=None):
 
 def tclient_conn():
     """
-    @return: libmproxy.proxy.connection.ClientConnection
+    @return: mitmproxy.proxy.connection.ClientConnection
     """
     c = ClientConnection.from_state(dict(
         address=dict(address=("address", 22), use_ipv6=True),
@@ -88,7 +88,7 @@ def tclient_conn():
 
 def tserver_conn():
     """
-    @return: libmproxy.proxy.connection.ServerConnection
+    @return: mitmproxy.proxy.connection.ServerConnection
     """
     c = ServerConnection.from_state(dict(
         address=dict(address=("address", 22), use_ipv6=True),
@@ -108,7 +108,7 @@ def tserver_conn():
 
 def terr(content="error"):
     """
-    @return: libmproxy.protocol.primitives.Error
+    @return: mitmproxy.protocol.primitives.Error
     """
     err = Error(content)
     return err