Merge branch 'such-types'

27 files changed, 202 insertions, 230 deletions

diff --git a/mitmproxy/console/flowlist.py b/mitmproxy/console/flowlist.py
index a05ed659..73c8ade5 100644
--- a/mitmproxy/console/flowlist.py
+++ b/mitmproxy/console/flowlist.py
@@ -295,8 +295,7 @@ class FlowListWalker(urwid.ListWalker):
 
 class FlowListBox(urwid.ListBox):
 
-    def __init__(self, master):
-        # type: (mitmproxy.console.master.ConsoleMaster) -> None
+    def __init__(self, master: "mitmproxy.console.master.ConsoleMaster"):
         self.master = master
         super(FlowListBox, self).__init__(FlowListWalker(master, master.state))
 
diff --git a/mitmproxy/console/flowview.py b/mitmproxy/console/flowview.py
index 4643863c..3b43fd49 100644
--- a/mitmproxy/console/flowview.py
+++ b/mitmproxy/console/flowview.py
@@ -102,9 +102,9 @@ footer = [
 
 class FlowViewHeader(urwid.WidgetWrap):
 
-    def __init__(self, master, f):
-        self.master = master  # type: "mitmproxy.console.master.ConsoleMaster"
-        self.flow = f  # type: models.HTTPFlow
+    def __init__(self, master: "mitmproxy.console.master.ConsoleMaster", f: models.HTTPFlow):
+        self.master = master
+        self.flow = f
         self._w = common.format_flow(
             f,
             False,
diff --git a/mitmproxy/console/grideditor/base.py b/mitmproxy/console/grideditor/base.py
index eed70c0b..12c1b3c1 100644
--- a/mitmproxy/console/grideditor/base.py
+++ b/mitmproxy/console/grideditor/base.py
@@ -1,19 +1,19 @@
 from __future__ import absolute_import, print_function, division
+
 import abc
 import copy
+from typing import Any
+from typing import Callable
+from typing import Container
+from typing import Iterable
+from typing import Optional
+from typing import Sequence
+from typing import Tuple
 
 import urwid
 from mitmproxy.console import common
 from mitmproxy.console import signals
 
-from typing import Any  # noqa
-from typing import Callable  # noqa
-from typing import Container  # noqa
-from typing import Iterable  # noqa
-from typing import Optional  # noqa
-from typing import Sequence  # noqa
-from typing import Tuple  # noqa
-
 FOOTER = [
     ('heading_key', "enter"), ":edit ",
     ('heading_key', "q"), ":back ",
@@ -30,27 +30,22 @@ class Column(object, metaclass=abc.ABCMeta):
         self.heading = heading
 
     @abc.abstractmethod
-    def Display(self, data):
-        # type: () -> Cell
+    def Display(self, data) -> Cell:
         pass
 
     @abc.abstractmethod
-    def Edit(self, data):
-        # type: () -> Cell
+    def Edit(self, data) -> Cell:
         pass
 
     @abc.abstractmethod
-    def blank(self):
-        # type: () -> Any
+    def blank(self) -> Any:
         pass
 
-    def keypress(self, key, editor):
-        # type: (str, GridEditor) -> Optional[str]
+    def keypress(self, key: str, editor: "GridEditor") -> Optional[str]:
         return key
 
 
 class Cell(urwid.WidgetWrap):
-
     def get_data(self):
         """
         Raises:
@@ -65,10 +60,10 @@ class Cell(urwid.WidgetWrap):
 class GridRow(urwid.WidgetWrap):
     def __init__(
             self,
-            focused,  # type: Optional[int]
-            editing,  # type: bool
-            editor,  # type: GridEditor
-            values  # type: Tuple[Iterable[bytes], Container[int]
+            focused: Optional[int],
+            editing: bool,
+            editor: GridEditor,
+            values: Tuple[Iterable[bytes], Container[int]]
     ):
         self.focused = focused
         self.editor = editor
@@ -121,8 +116,8 @@ class GridWalker(urwid.ListWalker):
 
     def __init__(
             self,
-            lst,  # type: Iterable[list]
-            editor  # type: GridEditor
+            lst: Iterable[list],
+            editor: GridEditor
     ):
         self.lst = [(i, set()) for i in lst]
         self.editor = editor
@@ -263,9 +258,9 @@ class GridEditor(urwid.WidgetWrap):
 
     def __init__(
             self,
-            master,  # type: "mitmproxy.console.master.ConsoleMaster"
-            value,  # type: Any
-            callback,  # type: Callable[..., None]
+            master: "mitmproxy.console.master.ConsoleMaster",
+            value: Any,
+            callback: Callable[..., None],
             *cb_args,
             **cb_kwargs
     ):
@@ -368,23 +363,20 @@ class GridEditor(urwid.WidgetWrap):
         elif column.keypress(key, self) and not self.handle_key(key):
             return self._w.keypress(size, key)
 
-    def data_out(self, data):
-        # type: (Sequence[list]) -> Any
+    def data_out(self, data: Sequence[list]) -> Any:
         """
             Called on raw list data, before data is returned through the
             callback.
         """
         return data
 
-    def data_in(self, data):
-        # type: (Any) -> Iterable[list]
+    def data_in(self, data: Any) -> Iterable[list]:
         """
             Called to prepare provided data.
         """
         return data
 
-    def is_error(self, col, val):
-        # type: (int, Any) -> Optional[str]
+    def is_error(self, col: int, val: Any) -> Optional[str]:
         """
             Return None, or a string error message.
         """
diff --git a/mitmproxy/console/grideditor/col_bytes.py b/mitmproxy/console/grideditor/col_bytes.py
index 51bbb6cb..43d813be 100644
--- a/mitmproxy/console/grideditor/col_bytes.py
+++ b/mitmproxy/console/grideditor/col_bytes.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import, print_function, division
 
 import os
+from typing import Callable, Optional
 
 import urwid
 from mitmproxy.console import signals
@@ -8,8 +9,7 @@ from mitmproxy.console.grideditor import base
 from netlib import strutils
 
 
-def read_file(filename, callback, escaped):
-    # type: (str, Callable[...,None], bool) -> Optional[str]
+def read_file(filename: str, callback: Callable[..., None], escaped: bool) -> Optional[str]:
     if not filename:
         return
 
@@ -70,27 +70,24 @@ class Column(base.Column):
 
 
 class Display(base.Cell):
-    def __init__(self, data):
-        # type: (bytes) -> Display
+    def __init__(self, data: bytes):
         self.data = data
         escaped = strutils.bytes_to_escaped_str(data)
         w = urwid.Text(escaped, wrap="any")
         super(Display, self).__init__(w)
 
-    def get_data(self):
+    def get_data(self) -> bytes:
         return self.data
 
 
 class Edit(base.Cell):
-    def __init__(self, data):
-        # type: (bytes) -> Edit
+    def __init__(self, data: bytes):
         data = strutils.bytes_to_escaped_str(data)
         w = urwid.Edit(edit_text=data, wrap="any", multiline=True)
         w = urwid.AttrWrap(w, "editfield")
         super(Edit, self).__init__(w)
 
-    def get_data(self):
-        # type: () -> bytes
+    def get_data(self) -> bytes:
         txt = self._w.get_text()[0].strip()
         try:
             return strutils.escaped_str_to_bytes(txt)
diff --git a/mitmproxy/console/grideditor/col_text.py b/mitmproxy/console/grideditor/col_text.py
index d60dc854..29c1abac 100644
--- a/mitmproxy/console/grideditor/col_text.py
+++ b/mitmproxy/console/grideditor/col_text.py
@@ -27,13 +27,12 @@ class Column(col_bytes.Column):
 
 # This is the same for both edit and display.
 class EncodingMixin(object):
-    def __init__(self, data, encoding_args):
-        # type: (str) -> TDisplay
+    def __init__(self, data: str, encoding_args):
         self.encoding_args = encoding_args
         data = data.encode(*self.encoding_args)
         super(EncodingMixin, self).__init__(data)
 
-    def get_data(self):
+    def get_data(self) -> str:
         data = super(EncodingMixin, self).get_data()
         try:
             return data.decode(*self.encoding_args)
diff --git a/mitmproxy/console/master.py b/mitmproxy/console/master.py
index d648d808..e7d74e2e 100644
--- a/mitmproxy/console/master.py
+++ b/mitmproxy/console/master.py
@@ -14,7 +14,7 @@ import traceback
 import weakref
 
 import urwid
-from typing import Optional  # noqa
+from typing import Optional
 
 from mitmproxy import builtins
 from mitmproxy import contentviews
@@ -201,13 +201,13 @@ class ConsoleState(flow.State):
 class Options(mitmproxy.options.Options):
     def __init__(
             self,
-            eventlog=False,  # type: bool
-            follow=False,  # type: bool
-            intercept=False,  # type: bool
-            filter=None,  # type: Optional[str]
-            palette=None,  # type: Optional[str]
-            palette_transparent=False,  # type: bool
-            no_mouse=False,  # type: bool
+            eventlog: bool = False,
+            follow: bool = False,
+            intercept: bool = False,
+            filter: Optional[str] = None,
+            palette: Optional[str] = None,
+            palette_transparent: bool = False,
+            no_mouse: bool = False,
             **kwargs
     ):
         self.eventlog = eventlog
diff --git a/mitmproxy/console/statusbar.py b/mitmproxy/console/statusbar.py
index bbfb41ab..9536abe7 100644
--- a/mitmproxy/console/statusbar.py
+++ b/mitmproxy/console/statusbar.py
@@ -116,8 +116,7 @@ class ActionBar(urwid.WidgetWrap):
 
 class StatusBar(urwid.WidgetWrap):
 
-    def __init__(self, master, helptext):
-        # type: (mitmproxy.console.master.ConsoleMaster, object) -> None
+    def __init__(self, master: "mitmproxy.console.master.ConsoleMaster", helptext):
         self.master = master
         self.helptext = helptext
         self.ib = urwid.WidgetWrap(urwid.Text(""))
diff --git a/mitmproxy/contentviews.py b/mitmproxy/contentviews.py
index 03ef8f05..24c4d396 100644
--- a/mitmproxy/contentviews.py
+++ b/mitmproxy/contentviews.py
@@ -14,22 +14,24 @@ requests, the query parameters are passed as the ``query`` keyword argument.
 """
 from __future__ import absolute_import, print_function, division
 
-import cssutils
 import datetime
+import io
 import json
 import logging
 import subprocess
 import traceback
-import io
-from typing import Mapping  # noqa
+from typing import Generator
+from typing import Mapping
+from typing import Tuple
+from typing import Union
 
+import cssutils
+import html2text
+import jsbeautifier
 import lxml.etree
 import lxml.html
 from PIL import ExifTags
 from PIL import Image
-import html2text
-import jsbeautifier
-
 from mitmproxy import exceptions
 from mitmproxy.contrib.wbxml import ASCommandResponse
 from netlib import http
@@ -43,15 +45,13 @@ try:
 except ImportError:  # pragma no cover
     pyamf = None
 
-
 # Default view cutoff *in lines*
 VIEW_CUTOFF = 512
 
 KEY_MAX = 30
 
 
-def pretty_json(s):
-    # type: (bytes) -> bytes
+def pretty_json(s: bytes) -> bytes:
     try:
         p = json.loads(s.decode('utf-8'))
     except ValueError:
@@ -65,8 +65,9 @@ def pretty_json(s):
     return pretty
 
 
-def format_dict(d):
-    # type: (Mapping[Union[str,bytes], Union[str,bytes]]) -> Generator[Tuple[Union[str,bytes], Union[str,bytes]]]
+def format_dict(
+        d: Mapping[Union[str, bytes], Union[str, bytes]]
+) -> Generator[Tuple[Union[str, bytes], Union[str, bytes]], None, None]:
     """
     Helper function that transforms the given dictionary into a list of
         ("key",   key  )
@@ -99,7 +100,7 @@ class View(object):
 
     def __call__(
             self,
-            data,  # type: bytes
+            data: bytes,
             **metadata
     ):
         """
@@ -301,7 +302,6 @@ class ViewMultipart(View):
 
 if pyamf:
     class DummyObject(dict):
-
         def __init__(self, alias):
             dict.__init__(self)
 
@@ -309,6 +309,7 @@ if pyamf:
             data = input.readObject()
             self["data"] = data
 
+
     def pyamf_class_loader(s):
         for i in pyamf.CLASS_LOADERS:
             if i != pyamf_class_loader:
@@ -317,8 +318,10 @@ if pyamf:
                     return v
         return DummyObject
 
+
     pyamf.register_class_loader(pyamf_class_loader)
 
+
     class ViewAMF(View):
         name = "AMF"
         prompt = ("amf", "f")
@@ -450,7 +453,6 @@ class ViewImage(View):
 
 
 class ViewProtobuf(View):
-
     """Human friendly view of protocol buffers
     The view uses the protoc compiler to decode the binary
     """
@@ -514,7 +516,6 @@ class ViewWBXML(View):
     ]
 
     def __call__(self, data, **metadata):
-
         try:
             parser = ASCommandResponse.ASCommandResponse(data)
             parsedContent = parser.xmlString
diff --git a/mitmproxy/contrib/tnetstring.py b/mitmproxy/contrib/tnetstring.py
index 22ecab65..95157475 100644
--- a/mitmproxy/contrib/tnetstring.py
+++ b/mitmproxy/contrib/tnetstring.py
@@ -41,13 +41,12 @@ all other strings are returned as plain bytes.
 """
 
 import collections
-from typing import io, Union, Tuple  # noqa
+from typing import io, Union, Tuple
 
 TSerializable = Union[None, bool, int, float, bytes, list, tuple, dict]
 
 
-def dumps(value):
-    # type: (TSerializable) -> bytes
+def dumps(value: TSerializable) -> bytes:
     """
     This function dumps a python object as a tnetstring.
     """
@@ -59,8 +58,7 @@ def dumps(value):
     return b''.join(q)
 
 
-def dump(value, file_handle):
-    # type: (TSerializable, io.BinaryIO) -> None
+def dump(value: TSerializable, file_handle: io.BinaryIO) -> None:
     """
     This function dumps a python object as a tnetstring and
     writes it to the given file.
@@ -68,8 +66,7 @@ def dump(value, file_handle):
     file_handle.write(dumps(value))
 
 
-def _rdumpq(q, size, value):
-    # type: (collections.deque, int, TSerializable) -> int
+def _rdumpq(q: collections.deque, size: int, value: TSerializable) -> int:
     """
     Dump value as a tnetstring, to a deque instance, last chunks first.
 
@@ -152,16 +149,14 @@ def _rdumpq(q, size, value):
         raise ValueError("unserializable object: {} ({})".format(value, type(value)))
 
 
-def loads(string):
-    # type: (bytes) -> TSerializable
+def loads(string: bytes) -> TSerializable:
     """
     This function parses a tnetstring into a python object.
     """
     return pop(string)[0]
 
 
-def load(file_handle):
-    # type: (io.BinaryIO) -> TSerializable
+def load(file_handle: io.BinaryIO) -> TSerializable:
     """load(file) -> object
 
     This function reads a tnetstring from a file and parses it into a
@@ -188,8 +183,14 @@ def load(file_handle):
     return parse(data_type, data)
 
 
+<<<<<<< HEAD
 def parse(data_type, data):
     # type: (int, bytes) -> TSerializable
+=======
+def parse(data_type: int, data: bytes) -> TSerializable:
+    if six.PY2:
+        data_type = ord(data_type)
+>>>>>>> such-types
     if data_type == ord(b','):
         return data
     if data_type == ord(b';'):
@@ -231,8 +232,7 @@ def parse(data_type, data):
     raise ValueError("unknown type tag: {}".format(data_type))
 
 
-def pop(data):
-    # type: (bytes) -> Tuple[TSerializable, bytes]
+def pop(data: bytes) -> Tuple[TSerializable, bytes]:
     """
     This function parses a tnetstring into a python object.
     It returns a tuple giving the parsed object and a string
diff --git a/mitmproxy/ctx.py b/mitmproxy/ctx.py
index 5d2905fa..a54a2f21 100644
--- a/mitmproxy/ctx.py
+++ b/mitmproxy/ctx.py
@@ -1,4 +1,2 @@
-from typing import Callable  # noqa
-
 master = None  # type: "mitmproxy.flow.FlowMaster"
 log = None  # type: "mitmproxy.controller.Log"
diff --git a/mitmproxy/dump.py b/mitmproxy/dump.py
index c25d93f8..87f5783c 100644
--- a/mitmproxy/dump.py
+++ b/mitmproxy/dump.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import, print_function, division
 
-from typing import Optional  # noqa
-import typing  # noqa
+import typing
+from typing import Optional
 
 from mitmproxy import controller
 from mitmproxy import exceptions
@@ -19,10 +19,10 @@ class DumpError(Exception):
 class Options(options.Options):
     def __init__(
             self,
-            keepserving=False,  # type: bool
-            filtstr=None,  # type: Optional[str]
-            flow_detail=1,  # type: int
-            tfile=None,  # type: Optional[typing.io.TextIO]
+            keepserving: bool = False,
+            filtstr: Optional[str] = None,
+            flow_detail: int = 1,
+            tfile: Optional[typing.io.TextIO] = None,
             **kwargs
     ):
         self.filtstr = filtstr
diff --git a/mitmproxy/flow/export.py b/mitmproxy/flow/export.py
index 44ba1905..603bf85a 100644
--- a/mitmproxy/flow/export.py
+++ b/mitmproxy/flow/export.py
@@ -91,8 +91,7 @@ def python_code(flow):
     return code
 
 
-def is_json(headers, content):
-    # type: (netlib.http.Headers, bytes) -> bool
+def is_json(headers: netlib.http.Headers, content: bytes) -> bool:
     if headers:
         ct = netlib.http.parse_content_type(headers.get("content-type", ""))
         if ct and "%s/%s" % (ct[0], ct[1]) == "application/json":
diff --git a/mitmproxy/flow/io_compat.py b/mitmproxy/flow/io_compat.py
index e7753adb..31d5ed51 100644
--- a/mitmproxy/flow/io_compat.py
+++ b/mitmproxy/flow/io_compat.py
@@ -3,7 +3,7 @@ This module handles the import of mitmproxy flows generated by old versions.
 """
 from __future__ import absolute_import, print_function, division
 
-from typing import Any  # noqa
+from typing import Any
 
 from netlib import version, strutils
 
@@ -69,16 +69,14 @@ def convert_018_019(data):
     return data
 
 
-def _convert_dict_keys(o):
-    # type: (Any) -> Any
+def _convert_dict_keys(o: Any) -> Any:
     if isinstance(o, dict):
         return {strutils.native(k): _convert_dict_keys(v) for k, v in o.items()}
     else:
         return o
 
 
-def _convert_dict_vals(o, values_to_convert):
-    # type: (dict, dict) -> dict
+def _convert_dict_vals(o: dict, values_to_convert: dict) -> dict:
     for k, v in values_to_convert.items():
         if not o or k not in o:
             continue
@@ -89,8 +87,7 @@ def _convert_dict_vals(o, values_to_convert):
     return o
 
 
-def convert_unicode(data):
-    # type: (dict) -> dict
+def convert_unicode(data: dict) -> dict:
     """
     This method converts between Python 3 and Python 2 dumpfiles.
     """
diff --git a/mitmproxy/flowfilter.py b/mitmproxy/flowfilter.py
index 7080786f..cdbaf316 100644
--- a/mitmproxy/flowfilter.py
+++ b/mitmproxy/flowfilter.py
@@ -489,8 +489,7 @@ bnf = _make()
 TFilter = Callable[[Flow], bool]
 
 
-def parse(s):
-    # type: (str) -> TFilter
+def parse(s: str) -> TFilter:
     try:
         flt = bnf.parseString(s, parseAll=True)[0]
         flt.pattern = s
diff --git a/mitmproxy/models/flow.py b/mitmproxy/models/flow.py
index 165acfe7..95a5a699 100644
--- a/mitmproxy/models/flow.py
+++ b/mitmproxy/models/flow.py
@@ -67,14 +67,20 @@ class Flow(stateobject.StateObject):
     This class is usually subclassed for each protocol, e.g. HTTPFlow.
     """
 
-    def __init__(self, type, client_conn, server_conn, live=None):
+    def __init__(
+            self,
+            type: str,
+            client_conn: ClientConnection,
+            server_conn: ServerConnection,
+            live=None
+    ):
         self.type = type
         self.id = str(uuid.uuid4())
-        self.client_conn = client_conn  # type: ClientConnection
-        self.server_conn = server_conn  # type: ServerConnection
+        self.client_conn = client_conn
+        self.server_conn = server_conn
         self.live = live
 
-        self.error = None  # type: Error
+        self.error = None  # type: Optional[Error]
         self.intercepted = False  # type: bool
         self._backup = None  # type: Optional[Flow]
         self.reply = None
diff --git a/mitmproxy/options.py b/mitmproxy/options.py
index 3991231f..143c24ba 100644
--- a/mitmproxy/options.py
+++ b/mitmproxy/options.py
@@ -1,6 +1,8 @@
 from __future__ import absolute_import, print_function, division
+
+from typing import Tuple, Optional, Sequence
+
 from mitmproxy import optmanager
-from typing import Tuple, Optional, Sequence  # noqa
 
 APP_HOST = "mitm.it"
 APP_PORT = 80
@@ -24,62 +26,61 @@ class Options(optmanager.OptManager):
     def __init__(
             self,
             # TODO: rename to onboarding_app_*
-            app=True,  # type: bool
-            app_host=APP_HOST,  # type: str
-            app_port=APP_PORT,  # type: int
-            anticache=False,  # type: bool
-            anticomp=False,  # type: bool
-            client_replay=None,  # type: Optional[str]
-            replay_kill_extra=False,  # type: bool
-            keepserving=True,  # type: bool
-            no_server=False,  # type: bool
-            server_replay_nopop=False,  # type: bool
-            refresh_server_playback=False,  # type: bool
-            rfile=None,  # type: Optional[str]
-            scripts=(),  # type: Sequence[str]
-            showhost=False,  # type: bool
-            replacements=(),  # type: Sequence[Tuple[str, str, str]]
-            server_replay_use_headers=(),  # type: Sequence[str]
-            setheaders=(),  # type: Sequence[Tuple[str, str, str]]
-            server_replay=None,  # type: Sequence[str]
-            stickycookie=None,  # type: Optional[str]
-            stickyauth=None,  # type: Optional[str]
-            stream_large_bodies=None,  # type: Optional[str]
-            verbosity=2,  # type: int
-            outfile=None,  # type: Tuple[str, str]
-            server_replay_ignore_content=False,  # type: bool
-            server_replay_ignore_params=(),  # type: Sequence[str]
-            server_replay_ignore_payload_params=(),  # type: Sequence[str]
-            server_replay_ignore_host=False,  # type: bool
-
+            app: bool = True,
+            app_host: str = APP_HOST,
+            app_port: int = APP_PORT,
+            anticache: bool = False,
+            anticomp: bool = False,
+            client_replay: Optional[str] = None,
+            replay_kill_extra: bool = False,
+            keepserving: bool = True,
+            no_server: bool = False,
+            server_replay_nopop: bool = False,
+            refresh_server_playback: bool = False,
+            rfile: Optional[str] = None,
+            scripts: Sequence[str] = (),
+            showhost: bool = False,
+            replacements: Sequence[Tuple[str, str, str]] = (),
+            server_replay_use_headers: Sequence[str] = (),
+            setheaders: Sequence[Tuple[str, str, str]] = (),
+            server_replay: Sequence[str] = None,
+            stickycookie: Optional[str] = None,
+            stickyauth: Optional[str] = None,
+            stream_large_bodies: Optional[str] = None,
+            verbosity: int = 2,
+            outfile: Tuple[str, str] = None,
+            server_replay_ignore_content: bool = False,
+            server_replay_ignore_params: Sequence[str] = (),
+            server_replay_ignore_payload_params: Sequence[str] = (),
+            server_replay_ignore_host: bool = False,
             # Proxy options
-            auth_nonanonymous=False,  # type: bool
-            auth_singleuser=None,  # type: Optional[str]
-            auth_htpasswd=None,  # type: Optional[str]
-            add_upstream_certs_to_client_chain=False,  # type: bool
-            body_size_limit=None,  # type: Optional[int]
-            cadir = CA_DIR,  # type: str
-            certs = (),  # type: Sequence[Tuple[str, str]]
-            ciphers_client = DEFAULT_CLIENT_CIPHERS,   # type: str
-            ciphers_server = None,   # type: Optional[str]
-            clientcerts = None,  # type: Optional[str]
-            http2 = True,  # type: bool
-            ignore_hosts = (),  # type: Sequence[str]
-            listen_host = "",  # type: str
-            listen_port = LISTEN_PORT,  # type: int
-            mode = "regular",  # type: str
-            no_upstream_cert = False,  # type: bool
-            rawtcp = False,  # type: bool
-            websockets = False,  # type: bool
-            spoof_source_address = False,  # type: bool
-            upstream_server = "",  # type: str
-            upstream_auth = "",  # type: str
-            ssl_version_client="secure",  # type: str
-            ssl_version_server="secure",  # type: str
-            ssl_insecure=False,  # type: bool
-            ssl_verify_upstream_trusted_cadir=None,  # type: str
-            ssl_verify_upstream_trusted_ca=None,  # type: str
-            tcp_hosts = (),  # type: Sequence[str]
+            auth_nonanonymous: bool = False,
+            auth_singleuser: Optional[str] = None,
+            auth_htpasswd: Optional[str] = None,
+            add_upstream_certs_to_client_chain: bool = False,
+            body_size_limit: Optional[int] = None,
+            cadir: str = CA_DIR,
+            certs: Sequence[Tuple[str, str]] = (),
+            ciphers_client: str=DEFAULT_CLIENT_CIPHERS,
+            ciphers_server: Optional[str]=None,
+            clientcerts: Optional[str] = None,
+            http2: bool = True,
+            ignore_hosts: Sequence[str] = (),
+            listen_host: str = "",
+            listen_port: int = LISTEN_PORT,
+            mode: str = "regular",
+            no_upstream_cert: bool = False,
+            rawtcp: bool = False,
+            websockets: bool = False,
+            spoof_source_address: bool = False,
+            upstream_server: str = "",
+            upstream_auth: str = "",
+            ssl_version_client: str = "secure",
+            ssl_version_server: str = "secure",
+            ssl_insecure: bool = False,
+            ssl_verify_upstream_trusted_cadir: str = None,
+            ssl_verify_upstream_trusted_ca: str = None,
+            tcp_hosts: Sequence[str] = ()
     ):
         # We could replace all assignments with clever metaprogramming,
         # but type hints are a much more valueable asset.
diff --git a/mitmproxy/protocol/tls.py b/mitmproxy/protocol/tls.py
index 2a82cf17..203d9c29 100644
--- a/mitmproxy/protocol/tls.py
+++ b/mitmproxy/protocol/tls.py
@@ -1,9 +1,10 @@
 from __future__ import absolute_import, print_function, division
 
 import struct
+from typing import Optional  # noqa
+from typing import Union
 
 import construct
-
 import netlib.exceptions
 from mitmproxy import exceptions
 from mitmproxy.contrib.tls import _constructs
@@ -322,7 +323,7 @@ class TlsLayer(base.Layer):
         self._server_tls = server_tls
 
         self._custom_server_sni = custom_server_sni
-        self._client_hello = None  # type: TlsClientHello
+        self._client_hello = None  # type: Optional[TlsClientHello]
 
     def __call__(self):
         """
@@ -396,8 +397,7 @@ class TlsLayer(base.Layer):
         if self._server_tls and not self.server_conn.tls_established:
             self._establish_tls_with_server()
 
-    def set_server_tls(self, server_tls, sni=None):
-        # type: (bool, Union[str, None, False]) -> None
+    def set_server_tls(self, server_tls: bool, sni: Union[str, None, bool]=None) -> None:
         """
         Set the TLS settings for the next server connection that will be established.
         This function will not alter an existing connection.
diff --git a/mitmproxy/proxy/config.py b/mitmproxy/proxy/config.py
index e5b3bd04..bd1c3f62 100644
--- a/mitmproxy/proxy/config.py
+++ b/mitmproxy/proxy/config.py
@@ -4,12 +4,14 @@ import base64
 import collections
 import os
 import re
+from typing import Any
+
 from netlib import strutils
 
 from OpenSSL import SSL, crypto
 
 from mitmproxy import exceptions
-from mitmproxy import options as moptions  # noqa
+from mitmproxy import options as moptions
 from netlib import certutils
 from netlib import tcp
 from netlib.http import authentication
@@ -67,8 +69,8 @@ def parse_upstream_auth(auth):
 
 class ProxyConfig:
 
-    def __init__(self, options):
-        self.options = options  # type: moptions.Options
+    def __init__(self, options: moptions.Options):
+        self.options = options
 
         self.authenticator = None
         self.check_ignore = None
@@ -79,8 +81,7 @@ class ProxyConfig:
         self.configure(options, set(options.keys()))
         options.changed.connect(self.configure)
 
-    def configure(self, options, updated):
-        # type: (moptions.Options, Any) -> None
+    def configure(self, options: moptions.Options, updated: Any) -> None:
         if options.add_upstream_certs_to_client_chain and not options.ssl_insecure:
             raise exceptions.OptionsError(
                 "The verify-upstream-cert requires certificate verification to be disabled. "
diff --git a/mitmproxy/web/app.py b/mitmproxy/web/app.py
index e5a05098..ea2203ee 100644
--- a/mitmproxy/web/app.py
+++ b/mitmproxy/web/app.py
@@ -19,8 +19,7 @@ from mitmproxy import contentviews
 from netlib import version
 
 
-def convert_flow_to_json_dict(flow):
-    # type: (models.Flow) -> dict
+def convert_flow_to_json_dict(flow: models.Flow) -> dict:
     """
     Remove flow message content and cert to save transmission space.
 
@@ -122,8 +121,7 @@ class RequestHandler(BasicAuth, tornado.web.RequestHandler):
         return self.application.master.state
 
     @property
-    def master(self):
-        # type: () -> mitmproxy.web.master.WebMaster
+    def master(self) -> "mitmproxy.web.master.WebMaster":
         return self.application.master
 
     @property
diff --git a/mitmproxy/web/master.py b/mitmproxy/web/master.py
index 8ea9065b..8500c0cb 100644
--- a/mitmproxy/web/master.py
+++ b/mitmproxy/web/master.py
@@ -6,7 +6,7 @@ import collections
 import tornado.httpserver
 import tornado.ioloop
 
-from typing import Optional  # noqa
+from typing import Optional
 
 from mitmproxy import builtins
 from mitmproxy import controller
@@ -95,13 +95,13 @@ class WebState(flow.State):
 class Options(options.Options):
     def __init__(
             self,
-            intercept=None,  # type: Optional[str]
-            wdebug=bool,  # type: bool
-            wport=8081,  # type: int
-            wiface="127.0.0.1",  # type: str
-            wauthenticator=None,  # type: Optional[authentication.PassMan]
-            wsingleuser=None,  # type: Optional[str]
-            whtpasswd=None,  # type: Optional[str]
+            intercept: Optional[str] = None,
+            wdebug: bool = bool,
+            wport: int = 8081,
+            wiface: str = "127.0.0.1",
+            wauthenticator: Optional[authentication.PassMan] = None,
+            wsingleuser: Optional[str] = None,
+            whtpasswd: Optional[str] = None,
             **kwargs
     ):
         self.wdebug = wdebug
diff --git a/netlib/encoding.py b/netlib/encoding.py
index f0f7381d..a6ae9a96 100644
--- a/netlib/encoding.py
+++ b/netlib/encoding.py
@@ -11,7 +11,7 @@ import gzip
 import zlib
 import brotli
 
-from typing import Union  # noqa
+from typing import Union
 
 
 # We have a shared single-element cache for encoding and decoding.
@@ -22,8 +22,7 @@ CachedDecode = collections.namedtuple("CachedDecode", "encoded encoding errors d
 _cache = CachedDecode(None, None, None, None)
 
 
-def decode(encoded, encoding, errors='strict'):
-    # type: (Union[str, bytes], str, str) -> Union[str, bytes]
+def decode(encoded: Union[str, bytes], encoding: str, errors: str='strict') -> Union[str, bytes]:
     """
     Decode the given input object
 
@@ -64,8 +63,7 @@ def decode(encoded, encoding, errors='strict'):
         ))
 
 
-def encode(decoded, encoding, errors='strict'):
-    # type: (Union[str, bytes], str, str) -> Union[str, bytes]
+def encode(decoded: Union[str, bytes], encoding: str, errors: str='strict') -> Union[str, bytes]:
     """
     Encode the given input object
 
diff --git a/netlib/http/message.py b/netlib/http/message.py
index 13f908ca..e44faf18 100644
--- a/netlib/http/message.py
+++ b/netlib/http/message.py
@@ -2,6 +2,7 @@ from __future__ import absolute_import, print_function, division
 
 import re
 import warnings
+from typing import Optional
 
 from netlib import encoding, strutils, basetypes
 from netlib.http import headers
@@ -77,8 +78,7 @@ class Message(basetypes.Serializable):
         self.data.headers = h
 
     @property
-    def raw_content(self):
-        # type: () -> bytes
+    def raw_content(self) -> bytes:
         """
         The raw (encoded) HTTP message body
 
@@ -90,8 +90,7 @@ class Message(basetypes.Serializable):
     def raw_content(self, content):
         self.data.content = content
 
-    def get_content(self, strict=True):
-        # type: (bool) -> bytes
+    def get_content(self, strict: bool=True) -> bytes:
         """
         The HTTP message body decoded with the content-encoding header (e.g. gzip)
 
@@ -168,14 +167,12 @@ class Message(basetypes.Serializable):
     def timestamp_end(self, timestamp_end):
         self.data.timestamp_end = timestamp_end
 
-    def _get_content_type_charset(self):
-        # type: () -> Optional[str]
+    def _get_content_type_charset(self) -> Optional[str]:
         ct = headers.parse_content_type(self.headers.get("content-type", ""))
         if ct:
             return ct[2].get("charset")
 
-    def _guess_encoding(self):
-        # type: () -> str
+    def _guess_encoding(self) -> str:
         enc = self._get_content_type_charset()
         if enc:
             return enc
@@ -186,8 +183,7 @@ class Message(basetypes.Serializable):
             # We may also want to check for HTML meta tags here at some point.
             return "latin-1"
 
-    def get_text(self, strict=True):
-        # type: (bool) -> str
+    def get_text(self, strict: bool=True) -> str:
         """
         The HTTP message body decoded with both content-encoding header (e.g. gzip)
         and content-type header charset.
diff --git a/netlib/http/request.py b/netlib/http/request.py
index cccda13e..7a83894b 100644
--- a/netlib/http/request.py
+++ b/netlib/http/request.py
@@ -248,8 +248,7 @@ class Request(message.Message):
         return netlib.http.url.unparse(self.scheme, self.pretty_host, self.port, self.path)
 
     @property
-    def query(self):
-        # type: () -> multidict.MultiDictView
+    def query(self) -> multidict.MultiDictView:
         """
         The request query string as an :py:class:`~netlib.multidict.MultiDictView` object.
         """
@@ -272,8 +271,7 @@ class Request(message.Message):
         self._set_query(value)
 
     @property
-    def cookies(self):
-        # type: () -> multidict.MultiDictView
+    def cookies(self) -> multidict.MultiDictView:
         """
         The request cookies.
 
diff --git a/netlib/http/response.py b/netlib/http/response.py
index 30bec2df..02a93fa7 100644
--- a/netlib/http/response.py
+++ b/netlib/http/response.py
@@ -8,11 +8,11 @@ from netlib.http import cookies
 from netlib.http import headers as nheaders
 from netlib.http import message
 from netlib.http import status_codes
-from typing import AnyStr  # noqa
-from typing import Dict  # noqa
-from typing import Iterable  # noqa
-from typing import Tuple  # noqa
-from typing import Union  # noqa
+from typing import AnyStr
+from typing import Dict
+from typing import Iterable
+from typing import Tuple
+from typing import Union
 
 
 class ResponseData(message.MessageData):
@@ -69,9 +69,9 @@ class Response(message.Message):
     @classmethod
     def make(
             cls,
-            status_code=200,  # type: int
-            content=b"",  # type: AnyStr
-            headers=()  # type: Union[Dict[AnyStr, AnyStr], Iterable[Tuple[bytes, bytes]]]
+            status_code: int=200,
+            content: AnyStr=b"",
+            headers: Union[Dict[AnyStr, AnyStr], Iterable[Tuple[bytes, bytes]]]=()
     ):
         """
         Simplified API for creating response objects.
@@ -130,8 +130,7 @@ class Response(message.Message):
         self.data.reason = message._always_bytes(reason)
 
     @property
-    def cookies(self):
-        # type: () -> multidict.MultiDictView
+    def cookies(self) -> multidict.MultiDictView:
         """
         The response cookies. A possibly empty
         :py:class:`~netlib.multidict.MultiDictView`, where the keys are cookie
diff --git a/netlib/http/url.py b/netlib/http/url.py
index 2878734a..67e22efa 100644
--- a/netlib/http/url.py
+++ b/netlib/http/url.py
@@ -1,4 +1,6 @@
 import urllib
+from typing import Sequence
+from typing import Tuple
 
 from netlib import utils
 
@@ -80,8 +82,7 @@ def unparse(scheme, host, port, path=""):
     return "%s://%s%s" % (scheme, hostport(scheme, host, port), path)
 
 
-def encode(s):
-    # type: Sequence[Tuple[str,str]] -> str
+def encode(s: Sequence[Tuple[str, str]]) -> str:
     """
         Takes a list of (key, value) tuples and returns a urlencoded string.
     """
@@ -95,23 +96,21 @@ def decode(s):
     return urllib.parse.parse_qsl(s, keep_blank_values=True, errors='surrogateescape')
 
 
-def quote(b, safe="/"):
+def quote(b: str, safe: str="/") -> str:
     """
     Returns:
         An ascii-encodable str.
     """
-    # type: (str) -> str
     return urllib.parse.quote(b, safe=safe, errors="surrogateescape")
 
 
-def unquote(s):
+def unquote(s: str) -> str:
     """
     Args:
         s: A surrogate-escaped str
     Returns:
         A surrogate-escaped str
     """
-    # type: (str) -> str
     return urllib.parse.unquote(s, errors="surrogateescape")
 
 
diff --git a/netlib/strutils.py b/netlib/strutils.py
index 81e95792..1f7db949 100644
--- a/netlib/strutils.py
+++ b/netlib/strutils.py
@@ -43,14 +43,13 @@ _control_char_trans = str.maketrans(_control_char_trans)
 _control_char_trans_newline = str.maketrans(_control_char_trans_newline)
 
 
-def escape_control_characters(text, keep_spacing=True):
+def escape_control_characters(text: str, keep_spacing=True) -> str:
     """
     Replace all unicode C1 control characters from the given text with a single "."
 
     Args:
         keep_spacing: If True, tabs and newlines will not be replaced.
     """
-    # type: (str) -> str
     if not isinstance(text, str):
         raise ValueError("text type must be unicode but is {}".format(type(text).__name__))
 
@@ -101,8 +100,7 @@ def escaped_str_to_bytes(data):
     return codecs.escape_decode(data)[0]
 
 
-def is_mostly_bin(s):
-    # type: (bytes) -> bool
+def is_mostly_bin(s: bytes) -> bool:
     if not s or len(s) == 0:
         return False
 
@@ -112,8 +110,7 @@ def is_mostly_bin(s):
     ) / len(s[:100]) > 0.3
 
 
-def is_xml(s):
-    # type: (bytes) -> bool
+def is_xml(s: bytes) -> bool:
     return s.strip().startswith(b"<")
 
 
diff --git a/netlib/utils.py b/netlib/utils.py
index 0deb7c82..8a8b15ea 100644
--- a/netlib/utils.py
+++ b/netlib/utils.py
@@ -79,8 +79,7 @@ class Data(object):
 _label_valid = re.compile(b"(?!-)[A-Z\d-]{1,63}(?<!-)$", re.IGNORECASE)
 
 
-def is_valid_host(host):
-    # type: (bytes) -> bool
+def is_valid_host(host: bytes) -> bool:
     """
         Checks if a hostname is valid.
     """