diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-08-17 23:06:25 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-08-17 23:06:25 +0200 |
| commit | bb2ce689a91de64d4e6b2191760399255f9eba6a (patch) | |
| tree | 7796dbae122b6cf1998aab43f07e4cc46e6cdcf5 | |
| parent | da3e7c0187e7baaf94359ae428461787df52c19f (diff) | |
| download | mitmproxy-bb2ce689a91de64d4e6b2191760399255f9eba6a.tar.gz mitmproxy-bb2ce689a91de64d4e6b2191760399255f9eba6a.tar.bz2 mitmproxy-bb2ce689a91de64d4e6b2191760399255f9eba6a.zip | |
adjust to netlib changes
| -rw-r--r-- | libmproxy/cmdline.py | 2 | ||||
| -rw-r--r-- | libmproxy/contrib/README | 2 | ||||
| -rw-r--r-- | test/test_proxy.py | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/libmproxy/cmdline.py b/libmproxy/cmdline.py index 500337a7..b9e62b71 100644 --- a/libmproxy/cmdline.py +++ b/libmproxy/cmdline.py @@ -440,7 +440,7 @@ def common_options(parser): ) user_specification_group.add_argument( "--htpasswd", - action="store", dest="auth_htpasswd", type=argparse.FileType('r'), + action="store", dest="auth_htpasswd", type=str, metavar="PATH", help="Allow access to users specified in an Apache htpasswd file." ) diff --git a/libmproxy/contrib/README b/libmproxy/contrib/README index 7dc7c87d..656df3dd 100644 --- a/libmproxy/contrib/README +++ b/libmproxy/contrib/README @@ -11,6 +11,4 @@ jsbeautifier, git checkout 25/03/12, MIT license html2text, git checkout 18/08/12, GPLv3 -md5crypt, PSF license, http://code.activestate.com/recipes/325204/ - WinDivert 1.1.4, LGPL license, http://reqrypt.org/windivert.html
\ No newline at end of file diff --git a/test/test_proxy.py b/test/test_proxy.py index 31a6aa19..2ff01acc 100644 --- a/test/test_proxy.py +++ b/test/test_proxy.py @@ -92,7 +92,7 @@ class TestProcessProxyOptions: p = self.assert_noerr("--htpasswd", tutils.test_data.path("data/htpasswd")) assert p.authenticator - self.assert_err("invalid htpasswd file", "--htpasswd", tutils.test_data.path("data/htpasswd.invalid")) + self.assert_err("malformed htpasswd file", "--htpasswd", tutils.test_data.path("data/htpasswd.invalid")) p = self.assert_noerr("--singleuser", "test:test") assert p.authenticator |