# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 2017-06-20 16:41:46 # Node ID 30d0cb279bacf791577e90124b2a94018588f0b8 # Parent 4107eb8a5648ad31f7fb3e95bbc8999c73a94c49 py3: catch binascii.Error raised from binascii.unhexlify Before Python 3, binsacii.unhexlify used to raise TypeError, now it raises binascii.Error. diff --git a/mercurial/revlog.py b/mercurial/revlog.py --- a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -13,6 +13,7 @@ and O(changes) merge between branches. from __future__ import absolute_import +import binascii import collections import errno import hashlib @@ -1094,7 +1095,7 @@ class revlog(object): if maybewdir: raise error.WdirUnsupported return None - except TypeError: + except (TypeError, binascii.Error): pass def lookup(self, id):