diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-07-24 17:52:44 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-07-24 17:52:44 +0200 |
| commit | 0892649d319d542897e4761cd75dc8206ec9a7b1 (patch) | |
| tree | 833c4233335b9418658189e82937447defb90580 /libmproxy/console/grideditor.py | |
| parent | e0d1e8caf64e049d103a1273d83207dbf5df775b (diff) | |
| parent | cedc0407de2fc4018c3d1852fc5678d532dc8e6e (diff) | |
| download | mitmproxy-0892649d319d542897e4761cd75dc8206ec9a7b1.tar.gz mitmproxy-0892649d319d542897e4761cd75dc8206ec9a7b1.tar.bz2 mitmproxy-0892649d319d542897e4761cd75dc8206ec9a7b1.zip | |
Merge pull request #675 from Kriechi/protocol-refactor
HTTP protocol refactoring
Diffstat (limited to 'libmproxy/console/grideditor.py')
| -rw-r--r-- | libmproxy/console/grideditor.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libmproxy/console/grideditor.py b/libmproxy/console/grideditor.py index c93ecabf..d32ce5b4 100644 --- a/libmproxy/console/grideditor.py +++ b/libmproxy/console/grideditor.py @@ -5,9 +5,11 @@ import re import os import urwid +from netlib import odict +from netlib.http import user_agents + from . import common, signals from .. import utils, filt, script -from netlib import http_uastrings, http_cookies, odict FOOTER = [ @@ -516,7 +518,7 @@ class HeaderEditor(GridEditor): return text def set_user_agent(self, k): - ua = http_uastrings.get_by_shortcut(k) + ua = user_agents.get_by_shortcut(k) if ua: self.walker.add_value( [ @@ -529,7 +531,7 @@ class HeaderEditor(GridEditor): if key == "U": signals.status_prompt_onekey.send( prompt = "Add User-Agent header:", - keys = [(i[0], i[1]) for i in http_uastrings.UASTRINGS], + keys = [(i[0], i[1]) for i in user_agents.UASTRINGS], callback = self.set_user_agent, ) return True @@ -592,7 +594,7 @@ class SetHeadersEditor(GridEditor): return text def set_user_agent(self, k): - ua = http_uastrings.get_by_shortcut(k) + ua = user_agents.get_by_shortcut(k) if ua: self.walker.add_value( [ @@ -606,7 +608,7 @@ class SetHeadersEditor(GridEditor): if key == "U": signals.status_prompt_onekey.send( prompt = "Add User-Agent header:", - keys = [(i[0], i[1]) for i in http_uastrings.UASTRINGS], + keys = [(i[0], i[1]) for i in user_agents.UASTRINGS], callback = self.set_user_agent, ) return True |