diff -r 75aaae8ad660 -r 54d7657d7d1e mercurial/extensions.py --- a/mercurial/extensions.py Sat May 03 03:29:30 2014 +0200 +++ b/mercurial/extensions.py Mon May 05 16:54:15 2014 +0200 @@ -281,7 +281,7 @@ return dict((name, gettext(desc)) for name, desc in __index__.docs.iteritems() if name not in _order) - except ImportError: + except (ImportError, AttributeError): pass paths = _disabledpaths() @@ -304,7 +304,7 @@ return else: return gettext(__index__.docs.get(name)) - except ImportError: + except (ImportError, AttributeError): pass paths = _disabledpaths()