adjust to netlib changes

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."
     )

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

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