aboutsummaryrefslogtreecommitdiffstats
path: root/netlib
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-07-23 12:49:57 -0700
committerGitHub <noreply@github.com>2016-07-23 12:49:57 -0700
commitfa45722ed8a2fff50d02a14f52ff3440d63072bf (patch)
treeb29920e2a4ef5ea71f080517c0ba1371847850ec /netlib
parentfcb906dc97914ad7d852d7e0c04e68121946e350 (diff)
parent61de6fa1d65d4219c6798ab025e1beeca1247068 (diff)
downloadmitmproxy-fa45722ed8a2fff50d02a14f52ff3440d63072bf.tar.gz
mitmproxy-fa45722ed8a2fff50d02a14f52ff3440d63072bf.tar.bz2
mitmproxy-fa45722ed8a2fff50d02a14f52ff3440d63072bf.zip
Merge pull request #1402 from mhils/console-fixes
minor fixes
Diffstat (limited to 'netlib')
-rw-r--r--netlib/http/url.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/netlib/http/url.py b/netlib/http/url.py
index 2fc6e7ee..1c8c007a 100644
--- a/netlib/http/url.py
+++ b/netlib/http/url.py
@@ -82,6 +82,7 @@ def unparse(scheme, host, port, path=""):
def encode(s):
+ # type: (six.text_type, bytes) -> str
"""
Takes a list of (key, value) tuples and returns a urlencoded string.
"""