diff options
author | Maximilian Hils <git@maximilianhils.com> | 2016-05-20 20:02:56 -0700 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2016-05-20 20:02:56 -0700 |
commit | dcad3f72af52b51a14934ad767005bf36b46403d (patch) | |
tree | 71b063a741e2d41782777c918976b02b8f0da679 | |
parent | 97f3077082371a078380ec28e1425de3dc2a0021 (diff) | |
parent | eb914924ab56b28f982660c0600f6ae8818af204 (diff) | |
download | mitmproxy-dcad3f72af52b51a14934ad767005bf36b46403d.tar.gz mitmproxy-dcad3f72af52b51a14934ad767005bf36b46403d.tar.bz2 mitmproxy-dcad3f72af52b51a14934ad767005bf36b46403d.zip |
Merge branch 'issue-1099'
-rw-r--r-- | mitmproxy/console/flowview.py | 2 | ||||
-rw-r--r-- | netlib/http/message.py | 6 | ||||
-rw-r--r-- | netlib/multidict.py | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/mitmproxy/console/flowview.py b/mitmproxy/console/flowview.py index 3538c4ad..2010cecd 100644 --- a/mitmproxy/console/flowview.py +++ b/mitmproxy/console/flowview.py @@ -186,7 +186,7 @@ class FlowView(tabs.Tabs): viewmode, message, limit, - (bytes(message.headers), message.content) # Cache invalidation + message # Cache invalidation ) def _get_content_view(self, viewmode, message, max_lines, _): diff --git a/netlib/http/message.py b/netlib/http/message.py index 9b0180cf..028f43a1 100644 --- a/netlib/http/message.py +++ b/netlib/http/message.py @@ -26,6 +26,9 @@ class MessageData(utils.Serializable): def __ne__(self, other): return not self.__eq__(other) + def __hash__(self): + return hash(frozenset(self.__dict__.items())) + def set_state(self, state): for k, v in state.items(): if k == "headers": @@ -52,6 +55,9 @@ class Message(utils.Serializable): def __ne__(self, other): return not self.__eq__(other) + def __hash__(self): + return hash(self.data) ^ 1 + def get_state(self): return self.data.get_state() diff --git a/netlib/multidict.py b/netlib/multidict.py index 3af7979b..248acdec 100644 --- a/netlib/multidict.py +++ b/netlib/multidict.py @@ -81,6 +81,9 @@ class _MultiDict(MutableMapping, Serializable): def __ne__(self, other): return not self.__eq__(other) + def __hash__(self): + return hash(self.fields) + def get_all(self, key): """ Return the list of all values for a given key. |