diff options
Diffstat (limited to 'mitmproxy/tools')
-rw-r--r-- | mitmproxy/tools/console/commander/commander.py | 4 | ||||
-rw-r--r-- | mitmproxy/tools/console/flowlist.py | 2 | ||||
-rw-r--r-- | mitmproxy/tools/console/grideditor/base.py | 14 | ||||
-rw-r--r-- | mitmproxy/tools/console/grideditor/editors.py | 6 | ||||
-rw-r--r-- | mitmproxy/tools/console/master.py | 4 | ||||
-rw-r--r-- | mitmproxy/tools/console/palettes.py | 2 | ||||
-rw-r--r-- | mitmproxy/tools/main.py | 2 | ||||
-rw-r--r-- | mitmproxy/tools/web/app.py | 4 |
8 files changed, 19 insertions, 19 deletions
diff --git a/mitmproxy/tools/console/commander/commander.py b/mitmproxy/tools/console/commander/commander.py index f3e499f8..df3eaa5a 100644 --- a/mitmproxy/tools/console/commander/commander.py +++ b/mitmproxy/tools/console/commander/commander.py @@ -23,7 +23,7 @@ class ListCompleter(Completer): options: typing.Sequence[str], ) -> None: self.start = start - self.options = [] # type: typing.Sequence[str] + self.options: typing.Sequence[str] = [] for o in options: if o.startswith(start): self.options.append(o) @@ -53,7 +53,7 @@ class CommandBuffer: self.text = self.flatten(start) # Cursor is always within the range [0:len(buffer)]. self._cursor = len(self.text) - self.completion = None # type: CompletionState + self.completion: CompletionState = None @property def cursor(self) -> int: diff --git a/mitmproxy/tools/console/flowlist.py b/mitmproxy/tools/console/flowlist.py index 852c5163..78892fe1 100644 --- a/mitmproxy/tools/console/flowlist.py +++ b/mitmproxy/tools/console/flowlist.py @@ -74,7 +74,7 @@ class FlowListBox(urwid.ListBox, layoutwidget.LayoutWidget): def __init__( self, master: "mitmproxy.tools.console.master.ConsoleMaster" ) -> None: - self.master = master # type: "mitmproxy.tools.console.master.ConsoleMaster" + self.master: "mitmproxy.tools.console.master.ConsoleMaster" = master super().__init__(FlowListWalker(master)) def keypress(self, size, key): diff --git a/mitmproxy/tools/console/grideditor/base.py b/mitmproxy/tools/console/grideditor/base.py index 204820a8..3badf1a6 100644 --- a/mitmproxy/tools/console/grideditor/base.py +++ b/mitmproxy/tools/console/grideditor/base.py @@ -39,7 +39,7 @@ class Cell(urwid.WidgetWrap): class Column(metaclass=abc.ABCMeta): - subeditor = None # type: urwid.Edit + subeditor: urwid.Edit = None def __init__(self, heading): self.heading = heading @@ -71,10 +71,10 @@ class GridRow(urwid.WidgetWrap): ) -> None: self.focused = focused self.editor = editor - self.edit_col = None # type: typing.Optional[Cell] + self.edit_col: typing.Optional[Cell] = None errors = values[1] - self.fields = [] # type: typing.Sequence[typing.Any] + self.fields: typing.Sequence[typing.Any] = [] for i, v in enumerate(values[0]): if focused == i and editing: self.edit_col = self.editor.columns[i].Edit(v) @@ -123,11 +123,11 @@ class GridWalker(urwid.ListWalker): lst: typing.Iterable[list], editor: "GridEditor" ) -> None: - self.lst = [(i, set()) for i in lst] # type: typing.Sequence[typing.Tuple[typing.Any, typing.Set]] + self.lst: typing.Sequence[typing.Tuple[typing.Any, typing.Set]] = [(i, set()) for i in lst] self.editor = editor self.focus = 0 self.focus_col = 0 - self.edit_row = None # type: typing.Optional[GridRow] + self.edit_row: typing.Optional[GridRow] = None def _modified(self): self.editor.show_empty_msg() @@ -402,8 +402,8 @@ class BaseGridEditor(urwid.WidgetWrap): class GridEditor(BaseGridEditor): - title = None # type: str - columns = None # type: typing.Sequence[Column] + title: str = None + columns: typing.Sequence[Column] = None keyctx = "grideditor" def __init__( diff --git a/mitmproxy/tools/console/grideditor/editors.py b/mitmproxy/tools/console/grideditor/editors.py index fffd782c..61fcf6b4 100644 --- a/mitmproxy/tools/console/grideditor/editors.py +++ b/mitmproxy/tools/console/grideditor/editors.py @@ -107,7 +107,7 @@ class CookieAttributeEditor(base.FocusEditor): col_text.Column("Name"), col_text.Column("Value"), ] - grideditor = None # type: base.BaseGridEditor + grideditor: base.BaseGridEditor = None def data_in(self, data): return [(k, v or "") for k, v in data] @@ -169,7 +169,7 @@ class SetCookieEditor(base.FocusEditor): class OptionsEditor(base.GridEditor, layoutwidget.LayoutWidget): - title = None # type: str + title: str = None columns = [ col_text.Column("") ] @@ -189,7 +189,7 @@ class OptionsEditor(base.GridEditor, layoutwidget.LayoutWidget): class DataViewer(base.GridEditor, layoutwidget.LayoutWidget): - title = None # type: str + title: str = None def __init__( self, diff --git a/mitmproxy/tools/console/master.py b/mitmproxy/tools/console/master.py index de660b17..c66129b2 100644 --- a/mitmproxy/tools/console/master.py +++ b/mitmproxy/tools/console/master.py @@ -35,9 +35,9 @@ class ConsoleMaster(master.Master): def __init__(self, opts): super().__init__(opts) - self.start_err = None # type: typing.Optional[log.LogEntry] + self.start_err: typing.Optional[log.LogEntry] = None - self.view = view.View() # type: view.View + self.view: view.View = view.View() self.events = eventstore.EventStore() self.events.sig_add.connect(self.sig_add_log) diff --git a/mitmproxy/tools/console/palettes.py b/mitmproxy/tools/console/palettes.py index df69ff2f..7930c4a3 100644 --- a/mitmproxy/tools/console/palettes.py +++ b/mitmproxy/tools/console/palettes.py @@ -36,7 +36,7 @@ class Palette: # Commander 'commander_command', 'commander_invalid', 'commander_hint' ] - high = None # type: typing.Mapping[str, typing.Sequence[str]] + high: typing.Mapping[str, typing.Sequence[str]] = None def palette(self, transparent): l = [] diff --git a/mitmproxy/tools/main.py b/mitmproxy/tools/main.py index 53c236bb..8328cf80 100644 --- a/mitmproxy/tools/main.py +++ b/mitmproxy/tools/main.py @@ -92,7 +92,7 @@ def run( try: unknown = optmanager.load_paths(opts, args.conf) pconf = process_options(parser, opts, args) - server = None # type: typing.Any + server: typing.Any = None if pconf.options.server: try: server = proxy.server.ProxyServer(pconf) diff --git a/mitmproxy/tools/web/app.py b/mitmproxy/tools/web/app.py index c0c469e5..936eb75b 100644 --- a/mitmproxy/tools/web/app.py +++ b/mitmproxy/tools/web/app.py @@ -191,7 +191,7 @@ class FilterHelp(RequestHandler): class WebSocketEventBroadcaster(tornado.websocket.WebSocketHandler): # raise an error if inherited class doesn't specify its own instance. - connections = None # type: set + connections: set = None def open(self): self.connections.add(self) @@ -211,7 +211,7 @@ class WebSocketEventBroadcaster(tornado.websocket.WebSocketHandler): class ClientConnection(WebSocketEventBroadcaster): - connections = set() # type: set + connections: set = set() class Flows(RequestHandler): |