Mercurial > hg > mercurial-source

diff tests/hghave.py @ 30673:fe81c953f369

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hghave: fix has_bzr() to not try to import RevisionSpec as module Since RevisionSpec isn't a module, "import bzrlib.revisionspec.RevisionSpec" would always raise ImportError.
author Yuya Nishihara <yuya@tcha.org>
date Sun, 04 Sep 2016 17:19:44 +0900
parents 80ba176bad62
children 46a0203dfb89
line wrap: on
line diff
--- a/tests/hghave.py
+++ b/tests/hghave.py
@@ -113,9 +113,10 @@
         import bzrlib.bzrdir
         import bzrlib.errors
         import bzrlib.revision
-        import bzrlib.revisionspec.RevisionSpec
+        import bzrlib.revisionspec
+        bzrlib.revisionspec.RevisionSpec
         return bzrlib.__doc__ is not None
-    except ImportError:
+    except (AttributeError, ImportError):
         return False
 
 @checkvers("bzr", "Canonical's Bazaar client >= %s", (1.14,))