# HG changeset patch
# User Andrew Fischer <andrew@apastron.co>
# Date 1533040717 18000
# Node ID ca7f02c9fa57033c5c0fbe66542c9cfb73851638
# Parent  b103685a082b45f001ff4884c63a28eb3a28d6ab
compat: improve detection of Mercurial 4.6

fixed case where AttributeError can be thrown when importing wireproto

diff -r b103685a082b -r ca7f02c9fa57 hgext3rd/topic/discovery.py
--- a/hgext3rd/topic/discovery.py	Tue Jul 31 13:06:20 2018 +0200
+++ b/hgext3rd/topic/discovery.py	Tue Jul 31 07:38:37 2018 -0500
@@ -16,7 +16,7 @@
 try:
     from mercurial import wireproto
     wireproto.branchmap
-except ImportError: # <= hg-4.5
+except (AttributeError, ImportError): # <= hg-4.5
     from mercurial import wireprotov1server as wireproto
 
 def _headssummary(orig, pushop, *args, **kwargs):