aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2011-08-02 16:55:54 +1200
committerAldo Cortesi <aldo@nullcube.com>2011-08-02 16:55:54 +1200
commitbb6ec29b186fdd482bae98e3fc33b71be5bf103e (patch)
tree258b138d42999e86c724b6aa8904261f4e0f89f4 /libmproxy/console.py
parent1ff6a767d001a8c0f45a190e26be363ea9410534 (diff)
downloadmitmproxy-bb6ec29b186fdd482bae98e3fc33b71be5bf103e.tar.gz
mitmproxy-bb6ec29b186fdd482bae98e3fc33b71be5bf103e.tar.bz2
mitmproxy-bb6ec29b186fdd482bae98e3fc33b71be5bf103e.zip
Fix encoding import crash.
Diffstat (limited to 'libmproxy/console.py')
-rw-r--r--libmproxy/console.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmproxy/console.py b/libmproxy/console.py
index ebc090d3..9b77b9dc 100644
--- a/libmproxy/console.py
+++ b/libmproxy/console.py
@@ -17,7 +17,7 @@ import mailcap, mimetypes, tempfile, os, subprocess, glob, time
import os.path, sys
import cStringIO
import urwid
-import controller, utils, filt, proxy, flow
+import controller, utils, filt, proxy, flow, encoding
VIEW_CUTOFF = 1024*100
EVENTLOG_SIZE = 500
@@ -868,6 +868,7 @@ class Options(object):
#begin nocover
+
class BodyPile(urwid.Pile):
def __init__(self, master):
h = urwid.Text("Event log")