From 37c8d3425da3f53eda34065c34df62684641d380 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Thu, 30 Jun 2011 14:30:48 +1200 Subject: [PATCH] Fix edit prompt display, return code editing. --- libmproxy/console.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libmproxy/console.py b/libmproxy/console.py index 4ae1f23aa..864cba238 100644 --- a/libmproxy/console.py +++ b/libmproxy/console.py @@ -372,7 +372,10 @@ class ConnectionView(WWrap): def set_resp_code(self, code): response = self.flow.response - response.code = code + try: + response.code = int(code) + except ValueError: + return None import BaseHTTPServer if BaseHTTPServer.BaseHTTPRequestHandler.responses.has_key(int(code)): response.msg = BaseHTTPServer.BaseHTTPRequestHandler.responses[int(code)][0] @@ -403,7 +406,7 @@ class ConnectionView(WWrap): elif part == "m" and self.state.view_flow_mode == VIEW_FLOW_REQUEST: self.master.prompt_onekey("Method", self.methods, self.edit_method) elif part == "c" and self.state.view_flow_mode == VIEW_FLOW_RESPONSE: - self.master.prompt_edit("Code", conn.code, self.set_resp_code) + self.master.prompt_edit("Code", str(conn.code), self.set_resp_code) elif part == "m" and self.state.view_flow_mode == VIEW_FLOW_RESPONSE: self.master.prompt_edit("Message", conn.msg, self.set_resp_msg) elif part == "r" and self.state.view_flow_mode == VIEW_FLOW_REQUEST: @@ -1290,7 +1293,7 @@ class ConsoleMaster(flow.FlowMaster): self.prompting = (callback, args) def prompt_edit(self, prompt, text, callback): - self.statusbar.prompt(prompt, text) + self.statusbar.prompt(prompt + ": ", text) self.view.set_focus("footer") self.prompting = (callback, [])