diff options
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/console/help.py | 25 | ||||
| -rw-r--r-- | libmproxy/proxy.py | 13 |
2 files changed, 19 insertions, 19 deletions
diff --git a/libmproxy/console/help.py b/libmproxy/console/help.py index c75d2ae2..64428fcc 100644 --- a/libmproxy/console/help.py +++ b/libmproxy/console/help.py @@ -31,18 +31,6 @@ class HelpView(urwid.ListBox): self.helptext() ) - def keypress(self, size, key): - key = common.shortcuts(key) - if key == "q": - self.master.statusbar = self.state[0] - self.master.body = self.state[1] - self.master.header = self.state[2] - self.master.make_view() - return None - elif key == "?": - key = None - return urwid.ListBox.keypress(self, size, key) - def helptext(self): text = [] text.append(urwid.Text([("head", "Keys for this view:\n")])) @@ -174,3 +162,16 @@ class HelpView(urwid.ListBox): text.extend(common.format_keyvals(examples, key="key", val="text", indent=4)) return text + def keypress(self, size, key): + key = common.shortcuts(key) + if key == "q": + self.master.statusbar = self.state[0] + self.master.body = self.state[1] + self.master.header = self.state[2] + self.master.make_view() + return None + elif key == "?": + key = None + return urwid.ListBox.keypress(self, size, key) + + diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index 912f3f31..92bdf5f4 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -146,14 +146,13 @@ def parse_request_line(request): except ValueError: raise ProxyError(400, "Can't parse request") port = int(port) - else: - if url.startswith("/") or url == "*": + elif url.startswith("/") or url == "*": scheme, port, host, path = None, None, None, url - else: - parts = utils.parse_url(url) - if not parts: - raise ProxyError(400, "Invalid url: %s"%url) - scheme, host, port, path = parts + else: + parts = utils.parse_url(url) + if not parts: + raise ProxyError(400, "Invalid url: %s"%url) + scheme, host, port, path = parts if not protocol.startswith("HTTP/"): raise ProxyError(400, "Unsupported protocol") major,minor = protocol.split('/')[1].split('.') |