diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2012-02-22 17:17:13 +1300 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2012-02-22 17:17:13 +1300 |
commit | 4f38b3a9c0dbbdf4bcd5e48386f3282263e2b5da (patch) | |
tree | 30f98cb6dd72f5515355d97bb1cc7815f620a3a5 /libmproxy | |
parent | a4270efaf281dac9392f412739a6aa6fdda9a016 (diff) | |
download | mitmproxy-4f38b3a9c0dbbdf4bcd5e48386f3282263e2b5da.tar.gz mitmproxy-4f38b3a9c0dbbdf4bcd5e48386f3282263e2b5da.tar.bz2 mitmproxy-4f38b3a9c0dbbdf4bcd5e48386f3282263e2b5da.zip |
Documentation and screenshots.
Diffstat (limited to 'libmproxy')
-rw-r--r-- | libmproxy/console/__init__.py | 1 | ||||
-rw-r--r-- | libmproxy/console/common.py | 6 | ||||
-rw-r--r-- | libmproxy/flow.py | 22 |
3 files changed, 22 insertions, 7 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index b07a6fe1..2f835189 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -318,7 +318,6 @@ class ConsoleMaster(flow.FlowMaster): ('heading_key', "q"), ":back", ] footer_text_flowview = [ - ('heading_key', "tab"), ":toggle view ", ('heading_key', "?"), ":help ", ('heading_key', "q"), ":back ", ] diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py index fbeb83d7..d1c6303a 100644 --- a/libmproxy/console/common.py +++ b/libmproxy/console/common.py @@ -84,6 +84,8 @@ def fcol(s, attr): +REPLAY_SYMBOL = u"\u21ba" + def format_flow(f, focus, extended=False, padding=2): pile = [] @@ -98,7 +100,7 @@ def format_flow(f, focus, extended=False, padding=2): else: req.append(fcol(">>" if focus else " ", "focus")) if f.request.is_replay(): - req.append(fcol(u"\u267B", "replay")) + req.append(fcol(REPLAY_SYMBOL, "replay")) req.append(fcol(f.request.method, "method")) preamble = sum(i[1] for i in req) + len(req) -1 @@ -126,7 +128,7 @@ def format_flow(f, focus, extended=False, padding=2): if f.response: if f.response.is_replay(): - resp.append(fcol(u"\u267B", "replay")) + resp.append(fcol(REPLAY_SYMBOL, "replay")) if f.response.code in [200, 304]: resp.append(fcol(f.response.code, "goodcode")) else: diff --git a/libmproxy/flow.py b/libmproxy/flow.py index f3bc39d8..4cde7bc9 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -58,6 +58,10 @@ class ODict: return self.lst == other.lst def __getitem__(self, k): + """ + Returns a list of values matching key. + + """ ret = [] k = self._kconv(k) for i in self.lst: @@ -73,18 +77,28 @@ class ODict: return new def __len__(self): + """ + Total number of (key, value) pairs. + """ return len(self.lst) - def __setitem__(self, k, values): - if isinstance(values, basestring): - raise ValueError("ODict values should be lists.") + def __setitem__(self, k, valuelist): + """ + Sets the values for key k. If there are existing values for this + key, they are cleared. + """ + if isinstance(valuelist, basestring): + raise ValueError("ODict valuelist should be lists.") k = self._kconv(k) new = self._filter_lst(k, self.lst) - for i in values: + for i in valuelist: new.append((k, i)) self.lst = new def __delitem__(self, k): + """ + Delete all items matching k. + """ self.lst = self._filter_lst(k, self.lst) def __contains__(self, k): |