diff options
| author | Marcelo Glezer <mg@tekii.com.ar> | 2015-01-14 14:45:19 -0300 |
|---|---|---|
| committer | Marcelo Glezer <mg@tekii.com.ar> | 2015-02-05 11:31:24 -0300 |
| commit | d9f562b5c0ba0b4769455c117c1321d63ff6497c (patch) | |
| tree | 9007a2432450291e60d07b049d6778639b0ccdd1 | |
| parent | 1a06f15ee0423941e906f6fc654094b0fa9a9e3a (diff) | |
| download | mitmproxy-d9f562b5c0ba0b4769455c117c1321d63ff6497c.tar.gz mitmproxy-d9f562b5c0ba0b4769455c117c1321d63ff6497c.tar.bz2 mitmproxy-d9f562b5c0ba0b4769455c117c1321d63ff6497c.zip | |
used get_decoded_content and removed decode call from headers as max suggested
| -rw-r--r-- | libmproxy/console/flowlist.py | 4 | ||||
| -rw-r--r-- | libmproxy/console/flowview.py | 4 | ||||
| -rw-r--r-- | libmproxy/protocol/http.py | 10 |
3 files changed, 4 insertions, 14 deletions
diff --git a/libmproxy/console/flowlist.py b/libmproxy/console/flowlist.py index 03dfe5ed..44b32855 100644 --- a/libmproxy/console/flowlist.py +++ b/libmproxy/console/flowlist.py @@ -143,12 +143,12 @@ class ConnectionItem(common.WWrap): def server_copy_response(self, k): if k == "c": try: - pyperclip.copy(self.flow.response_content()) + pyperclip.copy(self.flow.response.get_decoded_content()) except TypeError: self.master.statusbar.message("Content is binary or can be converted to text") elif k == "h": try: - pyperclip.copy(self.flow.response_headers()) + pyperclip.copy(str(self.flow.response.headers)) except TypeError: self.master.statusbar.message("Error converting headers to text") diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py index 25b085c3..08a0148f 100644 --- a/libmproxy/console/flowview.py +++ b/libmproxy/console/flowview.py @@ -652,12 +652,12 @@ class FlowView(common.WWrap): def server_copy_response(self, k): if k == "c": try: - pyperclip.copy(self.flow.response_content()) + pyperclip.copy(self.flow.response.get_decoded_content()) except TypeError: self.master.statusbar.message("Content is binary or can be converted to text") elif k == "h": try: - pyperclip.copy(self.flow.response_headers()) + pyperclip.copy(str(self.flow.response.headers)) except TypeError: self.master.statusbar.message("Error converting headers to text") diff --git a/libmproxy/protocol/http.py b/libmproxy/protocol/http.py index f59b76ad..284731b0 100644 --- a/libmproxy/protocol/http.py +++ b/libmproxy/protocol/http.py @@ -953,16 +953,6 @@ class HTTPFlow(Flow): c += self.response.replace(pattern, repl, *args, **kwargs) return c - def response_content(self): - with decoded(self.response): - s = self.response.content - return s - - def response_headers(self): - with decoded(self.response): - s = str(self.response.headers) - return s - class HttpAuthenticationError(Exception): def __init__(self, auth_headers=None): super(HttpAuthenticationError, self).__init__( |