comparison mercurial/error.py @ 37327:c6a7b99f150a

error: fix isinstnace check to use bytes instead of str Differential Revision: https://phab.mercurial-scm.org/D2528
author Augie Fackler <augie@google.com>
date Thu, 01 Mar 2018 18:05:47 -0500
parents 795bfa2a9103
children fe81af15675a
comparison
equal deleted inserted replaced
37326:496875e6d541 37327:c6a7b99f150a
45 self.name = name 45 self.name = name
46 self.index = index 46 self.index = index
47 # this can't be called 'message' because at least some installs of 47 # this can't be called 'message' because at least some installs of
48 # Python 2.6+ complain about the 'message' property being deprecated 48 # Python 2.6+ complain about the 'message' property being deprecated
49 self.lookupmessage = message 49 self.lookupmessage = message
50 if isinstance(name, str) and len(name) == 20: 50 if isinstance(name, bytes) and len(name) == 20:
51 from .node import short 51 from .node import short
52 name = short(name) 52 name = short(name)
53 RevlogError.__init__(self, '%s@%s: %s' % (index, name, message)) 53 RevlogError.__init__(self, '%s@%s: %s' % (index, name, message))
54 54
55 def __bytes__(self): 55 def __bytes__(self):