aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/http/url.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-10-16 21:17:39 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-10-16 21:17:39 -0700
commit9389601025415c47d5efaa6ac371ddca6d543f48 (patch)
tree7a2fa561d702425ccec7edbc5a35108523e3f33d /netlib/http/url.py
parentae3ff8ee1edc646e7a640219df1a312c27f7c339 (diff)
parent5a07892bfc58472c1b651f66deaf03176bfe79df (diff)
downloadmitmproxy-9389601025415c47d5efaa6ac371ddca6d543f48.tar.gz
mitmproxy-9389601025415c47d5efaa6ac371ddca6d543f48.tar.bz2
mitmproxy-9389601025415c47d5efaa6ac371ddca6d543f48.zip
Merge branch 'such-types'
Diffstat (limited to 'netlib/http/url.py')
-rw-r--r--netlib/http/url.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/netlib/http/url.py b/netlib/http/url.py
index 2878734a..67e22efa 100644
--- a/netlib/http/url.py
+++ b/netlib/http/url.py
@@ -1,4 +1,6 @@
import urllib
+from typing import Sequence
+from typing import Tuple
from netlib import utils
@@ -80,8 +82,7 @@ def unparse(scheme, host, port, path=""):
return "%s://%s%s" % (scheme, hostport(scheme, host, port), path)
-def encode(s):
- # type: Sequence[Tuple[str,str]] -> str
+def encode(s: Sequence[Tuple[str, str]]) -> str:
"""
Takes a list of (key, value) tuples and returns a urlencoded string.
"""
@@ -95,23 +96,21 @@ def decode(s):
return urllib.parse.parse_qsl(s, keep_blank_values=True, errors='surrogateescape')
-def quote(b, safe="/"):
+def quote(b: str, safe: str="/") -> str:
"""
Returns:
An ascii-encodable str.
"""
- # type: (str) -> str
return urllib.parse.quote(b, safe=safe, errors="surrogateescape")
-def unquote(s):
+def unquote(s: str) -> str:
"""
Args:
s: A surrogate-escaped str
Returns:
A surrogate-escaped str
"""
- # type: (str) -> str
return urllib.parse.unquote(s, errors="surrogateescape")