code formatting: fix whitespace issues

16 files changed, 42 insertions, 8 deletions

diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py
index 0df10256..6ae24d0d 100644
--- a/libmproxy/console/__init__.py
+++ b/libmproxy/console/__init__.py
@@ -22,6 +22,7 @@ EVENTLOG_SIZE = 500
 
 
 class ConsoleState(flow.State):
+
     def __init__(self):
         flow.State.__init__(self)
         self.focus = None
@@ -732,4 +733,4 @@ class ConsoleMaster(flow.FlowMaster):
         if super(ConsoleMaster, self).handle_script_change(script):
             signals.status_message.send(message='"{}" reloaded.'.format(script.filename))
         else:
-            signals.status_message.send(message='Error reloading "{}".'.format(script.filename))
\ No newline at end of file
+            signals.status_message.send(message='Error reloading "{}".'.format(script.filename))
diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py
index a9bd846b..276e45c2 100644
--- a/libmproxy/console/common.py
+++ b/libmproxy/console/common.py
@@ -242,7 +242,7 @@ def ask_save_path(prompt, data):
     signals.status_prompt_path.send(
         prompt = prompt,
         callback = ask_save_overwrite,
-        args =  (data, )
+        args = (data, )
     )
 
 
@@ -290,16 +290,16 @@ def copy_as_curl_command(flow):
     data = "curl "
 
     for k, v in flow.request.headers.fields:
-      data += "-H '%s:%s' " % (k, v)
+        data += "-H '%s:%s' " % (k, v)
 
     if flow.request.method != "GET":
-      data += "-X %s " % flow.request.method
+        data += "-X %s " % flow.request.method
 
     full_url = flow.request.scheme + "://" + flow.request.host + flow.request.path
     data += "'%s'" % full_url
 
     if flow.request.content:
-      data += " --data-binary '%s'" % flow.request.content
+        data += " --data-binary '%s'" % flow.request.content
 
     copy_to_clipboard_or_prompt(data)
 
@@ -316,7 +316,7 @@ def copy_as_python_code(flow):
 
     headers = "\n"
     for k, v in flow.request.headers.fields:
-      headers += "    '%s': '%s',\n" % (k, v)
+        headers += "    '%s': '%s',\n" % (k, v)
 
     full_url = flow.request.scheme + "://" + flow.request.host + flow.request.path
 
@@ -439,7 +439,7 @@ flowcache = utils.LRUCache(800)
 
 
 def format_flow(f, focus, extended=False, hostheader=False, padding=2,
-        marked=False):
+                marked=False):
     d = dict(
         intercepted = f.intercepted,
         acked = f.reply.acked,
diff --git a/libmproxy/console/flowlist.py b/libmproxy/console/flowlist.py
index a8df423f..c2201055 100644
--- a/libmproxy/console/flowlist.py
+++ b/libmproxy/console/flowlist.py
@@ -43,6 +43,7 @@ footer = [
 
 
 class EventListBox(urwid.ListBox):
+
     def __init__(self, master):
         self.master = master
         urwid.ListBox.__init__(self, master.eventlist)
@@ -60,6 +61,7 @@ class EventListBox(urwid.ListBox):
 
 
 class BodyPile(urwid.Pile):
+
     def __init__(self, master):
         h = urwid.Text("Event log")
         h = urwid.Padding(h, align="left", width=("relative", 100))
@@ -103,6 +105,7 @@ class BodyPile(urwid.Pile):
 
 
 class ConnectionItem(urwid.WidgetWrap):
+
     def __init__(self, master, state, flow, focus):
         self.master, self.state, self.flow = master, state, flow
         self.f = focus
@@ -273,6 +276,7 @@ class ConnectionItem(urwid.WidgetWrap):
 
 
 class FlowListWalker(urwid.ListWalker):
+
     def __init__(self, master, state):
         self.master, self.state = master, state
         signals.flowlist_change.connect(self.sig_flowlist_change)
@@ -301,6 +305,7 @@ class FlowListWalker(urwid.ListWalker):
 
 
 class FlowListBox(urwid.ListBox):
+
     def __init__(self, master):
         self.master = master
         urwid.ListBox.__init__(
diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py
index 7962c69c..8102de55 100644
--- a/libmproxy/console/flowview.py
+++ b/libmproxy/console/flowview.py
@@ -96,6 +96,7 @@ footer = [
 
 
 class FlowViewHeader(urwid.WidgetWrap):
+
     def __init__(self, master, f):
         self.master, self.flow = master, f
         self._w = common.format_flow(
@@ -218,7 +219,7 @@ class FlowView(tabs.Tabs):
             txt = []
             for (style, text) in line:
                 if total_chars + len(text) > max_chars:
-                    text = text[:max_chars-total_chars]
+                    text = text[:max_chars - total_chars]
                 txt.append((style, text))
                 total_chars += len(text)
                 if total_chars == max_chars:
diff --git a/libmproxy/console/grideditor.py b/libmproxy/console/grideditor.py
index 237eea28..a11c962c 100644
--- a/libmproxy/console/grideditor.py
+++ b/libmproxy/console/grideditor.py
@@ -63,6 +63,7 @@ class TextColumn:
 
 
 class SubgridColumn:
+
     def __init__(self, heading, subeditor):
         self.heading = heading
         self.subeditor = subeditor
@@ -97,6 +98,7 @@ class SubgridColumn:
 
 
 class SEscaped(urwid.WidgetWrap):
+
     def __init__(self, txt):
         txt = txt.encode("string-escape")
         w = urwid.Text(txt, wrap="any")
@@ -113,6 +115,7 @@ class SEscaped(urwid.WidgetWrap):
 
 
 class SEdit(urwid.WidgetWrap):
+
     def __init__(self, txt):
         txt = txt.encode("string-escape")
         w = urwid.Edit(edit_text=txt, wrap="any", multiline=True)
@@ -127,6 +130,7 @@ class SEdit(urwid.WidgetWrap):
 
 
 class GridRow(urwid.WidgetWrap):
+
     def __init__(self, focused, editing, editor, values):
         self.focused, self.editing, self.editor = focused, editing, editor
 
@@ -172,6 +176,7 @@ class GridRow(urwid.WidgetWrap):
 
 
 class GridWalker(urwid.ListWalker):
+
     """
         Stores rows as a list of (rows, errors) tuples, where rows is a list
         and errors is a set with an entry of each offset in rows that is an
@@ -311,6 +316,7 @@ class GridWalker(urwid.ListWalker):
 
 
 class GridListBox(urwid.ListBox):
+
     def __init__(self, lw):
         urwid.ListBox.__init__(self, lw)
 
diff --git a/libmproxy/console/help.py b/libmproxy/console/help.py
index 74748030..0c264ebf 100644
--- a/libmproxy/console/help.py
+++ b/libmproxy/console/help.py
@@ -12,6 +12,7 @@ footer = [
 
 
 class HelpView(urwid.ListBox):
+
     def __init__(self, help_context):
         self.help_context = help_context or []
         urwid.ListBox.__init__(
diff --git a/libmproxy/console/options.py b/libmproxy/console/options.py
index a365a78c..5c9e0cc9 100644
--- a/libmproxy/console/options.py
+++ b/libmproxy/console/options.py
@@ -22,6 +22,7 @@ help_context = _mkhelp()
 
 
 class Options(urwid.WidgetWrap):
+
     def __init__(self, master):
         self.master = master
         self.lb = select.Select(
diff --git a/libmproxy/console/palettepicker.py b/libmproxy/console/palettepicker.py
index 7e2c10cd..51ad0606 100644
--- a/libmproxy/console/palettepicker.py
+++ b/libmproxy/console/palettepicker.py
@@ -18,6 +18,7 @@ help_context = _mkhelp()
 
 
 class PalettePicker(urwid.WidgetWrap):
+
     def __init__(self, master):
         self.master = master
         low, high = [], []
diff --git a/libmproxy/console/palettes.py b/libmproxy/console/palettes.py
index d897a0a2..bd370181 100644
--- a/libmproxy/console/palettes.py
+++ b/libmproxy/console/palettes.py
@@ -65,6 +65,7 @@ class Palette:
 
 
 class LowDark(Palette):
+
     """
         Low-color dark background
     """
@@ -129,6 +130,7 @@ class Dark(LowDark):
 
 
 class LowLight(Palette):
+
     """
         Low-color light background
     """
diff --git a/libmproxy/console/pathedit.py b/libmproxy/console/pathedit.py
index dccec14a..4447070b 100644
--- a/libmproxy/console/pathedit.py
+++ b/libmproxy/console/pathedit.py
@@ -5,6 +5,7 @@ import urwid
 
 
 class _PathCompleter:
+
     def __init__(self, _testing=False):
         """
             _testing: disables reloading of the lookup table to make testing
@@ -55,6 +56,7 @@ class _PathCompleter:
 
 
 class PathEdit(urwid.Edit, _PathCompleter):
+
     def __init__(self, *args, **kwargs):
         urwid.Edit.__init__(self, *args, **kwargs)
         _PathCompleter.__init__(self)
diff --git a/libmproxy/console/searchable.py b/libmproxy/console/searchable.py
index dea0ac7f..cff1f0a1 100644
--- a/libmproxy/console/searchable.py
+++ b/libmproxy/console/searchable.py
@@ -4,6 +4,7 @@ from . import signals
 
 
 class Highlight(urwid.AttrMap):
+
     def __init__(self, t):
         urwid.AttrMap.__init__(
             self,
@@ -14,6 +15,7 @@ class Highlight(urwid.AttrMap):
 
 
 class Searchable(urwid.ListBox):
+
     def __init__(self, state, contents):
         self.walker = urwid.SimpleFocusListWalker(contents)
         urwid.ListBox.__init__(self, self.walker)
diff --git a/libmproxy/console/select.py b/libmproxy/console/select.py
index bf96a785..928a7ca5 100644
--- a/libmproxy/console/select.py
+++ b/libmproxy/console/select.py
@@ -4,6 +4,7 @@ from . import common
 
 
 class _OptionWidget(urwid.WidgetWrap):
+
     def __init__(self, option, text, shortcut, active, focus):
         self.option = option
         textattr = "text"
@@ -36,6 +37,7 @@ class _OptionWidget(urwid.WidgetWrap):
 
 
 class OptionWalker(urwid.ListWalker):
+
     def __init__(self, options):
         urwid.ListWalker.__init__(self)
         self.options = options
@@ -59,6 +61,7 @@ class OptionWalker(urwid.ListWalker):
 
 
 class Heading:
+
     def __init__(self, text):
         self.text = text
 
@@ -73,6 +76,7 @@ _neg = lambda: False
 
 
 class Option:
+
     def __init__(self, text, shortcut, getstate=None, activate=None):
         self.text = text
         self.shortcut = shortcut
@@ -89,6 +93,7 @@ class Option:
 
 
 class Select(urwid.ListBox):
+
     def __init__(self, options):
         self.walker = OptionWalker(options)
         urwid.ListBox.__init__(
diff --git a/libmproxy/console/signals.py b/libmproxy/console/signals.py
index 52f72d34..6a439bf3 100644
--- a/libmproxy/console/signals.py
+++ b/libmproxy/console/signals.py
@@ -2,6 +2,8 @@ import blinker
 
 # Show a status message in the action bar
 sig_add_event = blinker.Signal()
+
+
 def add_event(e, level):
     sig_add_event.send(
         None,
diff --git a/libmproxy/console/statusbar.py b/libmproxy/console/statusbar.py
index fd084f8c..4cc63a54 100644
--- a/libmproxy/console/statusbar.py
+++ b/libmproxy/console/statusbar.py
@@ -7,6 +7,7 @@ from . import pathedit, signals, common
 
 
 class ActionBar(urwid.WidgetWrap):
+
     def __init__(self):
         urwid.WidgetWrap.__init__(self, None)
         self.clear()
@@ -108,6 +109,7 @@ class ActionBar(urwid.WidgetWrap):
 
 
 class StatusBar(urwid.WidgetWrap):
+
     def __init__(self, master, helptext):
         self.master, self.helptext = master, helptext
         self.ab = ActionBar()
diff --git a/libmproxy/console/tabs.py b/libmproxy/console/tabs.py
index 6893494c..b5423038 100644
--- a/libmproxy/console/tabs.py
+++ b/libmproxy/console/tabs.py
@@ -2,6 +2,7 @@ import urwid
 
 
 class Tab(urwid.WidgetWrap):
+
     def __init__(self, offset, content, attr, onclick):
         """
             onclick is called on click with the tab offset as argument
@@ -20,6 +21,7 @@ class Tab(urwid.WidgetWrap):
 
 
 class Tabs(urwid.WidgetWrap):
+
     def __init__(self, tabs, tab_offset=0):
         urwid.WidgetWrap.__init__(self, "")
         self.tab_offset = tab_offset
diff --git a/libmproxy/console/window.py b/libmproxy/console/window.py
index 69d5e242..47c284e4 100644
--- a/libmproxy/console/window.py
+++ b/libmproxy/console/window.py
@@ -3,6 +3,7 @@ from . import signals
 
 
 class Window(urwid.Frame):
+
     def __init__(self, master, body, header, footer, helpctx):
         urwid.Frame.__init__(
             self,