# HG changeset patch
# User Steve Borho <steve@borho.org>
# Date 2011-05-09 04:59:59
# Node ID a6e455012d1406f694365155941aa7dc3dad5d11
# Parent  04cd5a463bf754f5ee2d73d2238fa2c42038e7ce

readauthforuri has been moved into new httpconnection module

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