##// END OF EJS Templates
With meu 1.5.0 should work on py3.
Marcin Kasperski -
r273:9eeda06b default
parent child Browse files
Show More
@@ -447,11 +447,9 b' class HTTPPasswordHandler(object):'
447 found. username and password can be None (if unset), if prefix
447 found. username and password can be None (if unset), if prefix
448 is not found, url itself is returned.
448 is not found, url itself is returned.
449 """
449 """
450 base_url = bytes(parsed_url)
451
452 from mercurial.httpconnection import readauthforuri
450 from mercurial.httpconnection import readauthforuri
453 ui.debug(b"keyring: checking for hgrc info about url %s, user %s\n" % (base_url, user))
451 ui.debug(b"keyring: checking for hgrc info about url %s, user %s\n" % (parsed_url, user))
454 res = readauthforuri(ui, base_url, user)
452 res = readauthforuri(ui, str(parsed_url), user)
455 # If it user-less version not work, let's try with added username to handle
453 # If it user-less version not work, let's try with added username to handle
456 # both config conventions
454 # both config conventions
457 if (not res) and user:
455 if (not res) and user:
@@ -472,7 +470,7 b' class HTTPPasswordHandler(object):'
472 password = None
470 password = None
473 prefix = None
471 prefix = None
474
472
475 password_url = self.password_url(base_url, prefix)
473 password_url = self.password_url(str(parsed_url), prefix)
476
474
477 ui.debug(b"keyring: Password url: %s, user: %s, password: %s (prefix: %s)\n" % (
475 ui.debug(b"keyring: Password url: %s, user: %s, password: %s (prefix: %s)\n" % (
478 password_url, username or b'', b'********' if password else b'', prefix or b''))
476 password_url, username or b'', b'********' if password else b'', prefix or b''))
@@ -36,7 +36,7 b' setup('
36 ],
36 ],
37 install_requires=[
37 install_requires=[
38 'keyring>=0.3',
38 'keyring>=0.3',
39 'mercurial_extension_utils>=1.3.6',
39 'mercurial_extension_utils>=1.5.0',
40 ],
40 ],
41 zip_safe=True,
41 zip_safe=True,
42 )
42 )
General Comments 0
You need to be logged in to leave comments. Login now