aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Kriechbaumer <Kriechi@users.noreply.github.com>2016-03-11 13:19:58 +0100
committerThomas Kriechbaumer <Kriechi@users.noreply.github.com>2016-03-11 13:19:58 +0100
commite74e212a7a50397c663d00cd07dd91974cd1894c (patch)
tree845ada412b2b232ec805f7fcbdd36710af8ec199
parent448d28e2cbe5020f97bccc80e9a7e1e5a3df9990 (diff)
parent90587cf998b6041fa19fc7d31b34643c80637973 (diff)
downloadmitmproxy-e74e212a7a50397c663d00cd07dd91974cd1894c.tar.gz
mitmproxy-e74e212a7a50397c663d00cd07dd91974cd1894c.tar.bz2
mitmproxy-e74e212a7a50397c663d00cd07dd91974cd1894c.zip
Merge pull request #1022 from dufferzafar/fix-1018
Fix missing cookie import
-rw-r--r--mitmproxy/console/grideditor.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mitmproxy/console/grideditor.py b/mitmproxy/console/grideditor.py
index a11c962c..597a7e7a 100644
--- a/mitmproxy/console/grideditor.py
+++ b/mitmproxy/console/grideditor.py
@@ -6,7 +6,7 @@ import os
import urwid
from netlib import odict
-from netlib.http import user_agents
+from netlib.http import user_agents, cookies
from . import common, signals
from .. import utils, filt, script
@@ -69,7 +69,7 @@ class SubgridColumn:
self.subeditor = subeditor
def text(self, obj):
- p = http_cookies._format_pairs(obj, sep="\n")
+ p = cookies._format_pairs(obj, sep="\n")
return urwid.Text(p)
def blank(self):