aboutsummaryrefslogtreecommitdiffstats
path: root/netlib
diff options
context:
space:
mode:
Diffstat (limited to 'netlib')
-rw-r--r--netlib/http.py4
-rw-r--r--netlib/http_auth.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/netlib/http.py b/netlib/http.py
index 7060b688..e160bd79 100644
--- a/netlib/http.py
+++ b/netlib/http.py
@@ -233,6 +233,10 @@ def parse_init(line):
def parse_init_connect(line):
+ """
+ Returns (host, port, httpversion) if line is a valid CONNECT line.
+ http://tools.ietf.org/html/draft-luotonen-web-proxy-tunneling-01 section 3.1
+ """
v = parse_init(line)
if not v:
return None
diff --git a/netlib/http_auth.py b/netlib/http_auth.py
index 69bee5c1..8f062826 100644
--- a/netlib/http_auth.py
+++ b/netlib/http_auth.py
@@ -126,8 +126,6 @@ class AuthAction(Action):
"""
def __call__(self, parser, namespace, values, option_string=None):
passman = self.getPasswordManager(values)
- if not passman:
- raise ArgumentTypeError("Error creating password manager for proxy authentication.")
authenticator = BasicProxyAuth(passman, "mitmproxy")
setattr(namespace, self.dest, authenticator)