From 5cbb1b739858e0db4d35e3cc28d0368965693c6e Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Mon, 11 Jul 2011 12:54:49 +0400 Subject: [PATCH] [hg] prompthooks.py fix import readauthforuri for 1.9 readautoforuri was moved to mercurial.httpconnection in 1.9 --- plugins/hg4idea/resources/python/prompthooks.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/hg4idea/resources/python/prompthooks.py b/plugins/hg4idea/resources/python/prompthooks.py index 2507a9daac14..9bcaf0e84384 100644 --- a/plugins/hg4idea/resources/python/prompthooks.py +++ b/plugins/hg4idea/resources/python/prompthooks.py @@ -176,8 +176,12 @@ def find_user_password(self, realm, authuri): return self.readauthtoken(authuri) else: def read_hgrc_authtoken(ui, authuri): - # hg 1.8 - from mercurial.url import readauthforuri + try: + # hg 1.8 + from mercurial.url import readauthforuri + except ImportError: + # hg 1.9: readauthforuri moved to httpconnection + from mercurial.httpconnection import readauthforuri res = readauthforuri(self.ui, authuri) if res: group, auth = res