diff --git a/mercurial_keyring.py b/mercurial_keyring.py --- a/mercurial_keyring.py +++ b/mercurial_keyring.py @@ -235,10 +235,12 @@ class HTTPPasswordHandler(object): except AttributeError: try: # hg 1.8 - from mercurial.url import readauthforuri - except ImportError: + import mercurial.url + readauthforuri = mercurial.url.readauthforuri + except (ImportError, AttributeError): # hg 1.9 - from mercurial.httpconnection import readauthforuri + import mercurial.httpconnection + readauthforuri = mercurial.httpconnection.readauthforuri res = readauthforuri(local_ui, base_url) if res: group, auth_token = res