diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-02-20 10:15:58 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-02-20 10:15:58 +1300 |
| commit | 25a06c3ec18a9ed49f34213024330aed59cb5322 (patch) | |
| tree | edff10cc1e94711d9346d2c6a05050865fa65dbf /libmproxy | |
| parent | 0c3035a2b5cbf0bba3185b1ffab3444cd8c20490 (diff) | |
| download | mitmproxy-25a06c3ec18a9ed49f34213024330aed59cb5322.tar.gz mitmproxy-25a06c3ec18a9ed49f34213024330aed59cb5322.tar.bz2 mitmproxy-25a06c3ec18a9ed49f34213024330aed59cb5322.zip | |
Minor doc fixes and import cleanups.
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/console/__init__.py | 10 | ||||
| -rw-r--r-- | libmproxy/flow.py | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index ca80d013..38d9223a 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -13,11 +13,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -import mailcap, mimetypes, tempfile, os, subprocess, glob, time, re +import mailcap, mimetypes, tempfile, os, subprocess, glob, time import os.path, sys -import cStringIO import urwid -from .. import controller, utils, filt, flow +from .. import controller, utils, flow import connlist, connview, help, common, kveditor, palettes EVENTLOG_SIZE = 500 @@ -177,18 +176,17 @@ class StatusBar(common.WWrap): t = [ ('heading', ("[%s]"%self.master.state.flow_count()).ljust(7)), ] - t.extend(self.get_status()) - if self.master.server: boundaddr = "[%s:%s]"%(self.master.server.address or "*", self.master.server.port) else: boundaddr = "" - + t.extend(self.get_status()) status = urwid.AttrWrap(urwid.Columns([ urwid.Text(t), urwid.Text( [ self.helptext, + boundaddr ], align="right" ), diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 66cb4790..024d23e6 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -1429,7 +1429,7 @@ class FlowReader: data = tnetstring.load(self.fo) off = self.fo.tell() yield Flow._from_state(data) - except ValueError, v: + except ValueError: # Error is due to EOF if self.fo.tell() == off and self.fo.read() == '': return |