aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/http/cookies.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-05-29 11:14:46 +1200
committerAldo Cortesi <aldo@nullcube.com>2016-05-29 11:14:46 +1200
commited415877d48251774012bd6aad4be91e9d558b79 (patch)
treee12a399c6df498f24aa5eeb9652dfaa90ab98dae /netlib/http/cookies.py
parent00426534982ab7fba5617ad6422c13483a8e6521 (diff)
parent7971dce2231bc32c25b962d425d8ad935568a699 (diff)
downloadmitmproxy-ed415877d48251774012bd6aad4be91e9d558b79.tar.gz
mitmproxy-ed415877d48251774012bd6aad4be91e9d558b79.tar.bz2
mitmproxy-ed415877d48251774012bd6aad4be91e9d558b79.zip
Merge branch 'master' into solidcore
Diffstat (limited to 'netlib/http/cookies.py')
-rw-r--r--netlib/http/cookies.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/netlib/http/cookies.py b/netlib/http/cookies.py
index 88c76870..2be93e18 100644
--- a/netlib/http/cookies.py
+++ b/netlib/http/cookies.py
@@ -3,7 +3,6 @@ import re
from email.utils import parsedate_tz, formatdate, mktime_tz
from netlib.multidict import ImmutableMultiDict
-from .. import odict
"""
A flexible module for cookie parsing and manipulation.
@@ -28,6 +27,7 @@ variants. Serialization follows RFC6265.
# TODO: Disallow LHS-only Cookie values
+
def _read_until(s, start, term):
"""
Read until one of the characters in term is reached.