comparison mercurial/templatefuncs.py @ 49248:63fd0282ad40

node: stop converting binascii.Error to TypeError in bin() Changeset f574cc00831a introduced the wrapper, to make bin() behave like on Python 2, where it raised TypeError in many cases. Another previous approach, changing callers to catch binascii.Error in addition to TypeError, was backed out after negative review feedback [1]. However, I think it?s worth reconsidering the approach. Now that we?re on Python 3 only, callers have to catch only binascii.Error instead of both. Catching binascii.Error instead of TypeError has the advantage that it?s less likely to cover a programming error (e.g. passing an int to bin() raises TypeError). Also, raising TypeError never made sense semantically when bin() got an argument of valid type. As a side-effect, this fixed an exception in test-http-bad-server.t. The TODO was outdated: it was not an uncaught ValueError in batch.results() but uncaught TypeError from the now removed wrapper. Now that bin() raises binascii.Error instead of TypeError, it gets converted to a proper error in wirepeer.heads.<locals>.decode() that catches ValueError (superclass of binascii.Error). This is a good example of why this changeset is a good idea. Catching TypeError instead of ValueError there would not make much sense. [1] https://phab.mercurial-scm.org/D2244
author Manuel Jacob <me@manueljacob.de>
date Mon, 30 May 2022 16:18:12 +0200
parents 278030cc9353
children 164b6c4878b8
comparison
equal deleted inserted replaced
49247:3e5f1fb2aec7 49248:63fd0282ad40
4 # 4 #
5 # This software may be used and distributed according to the terms of the 5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version. 6 # GNU General Public License version 2 or any later version.
7 7
8 8
9 import binascii
9 import re 10 import re
10 11
11 from .i18n import _ 12 from .i18n import _
12 from .node import bin 13 from .node import bin
13 from . import ( 14 from . import (
767 if len(hexnode) > hexnodelen: 768 if len(hexnode) > hexnodelen:
768 return hexnode 769 return hexnode
769 elif len(hexnode) == hexnodelen: 770 elif len(hexnode) == hexnodelen:
770 try: 771 try:
771 node = bin(hexnode) 772 node = bin(hexnode)
772 except TypeError: 773 except binascii.Error:
773 return hexnode 774 return hexnode
774 else: 775 else:
775 try: 776 try:
776 node = scmutil.resolvehexnodeidprefix(repo, hexnode) 777 node = scmutil.resolvehexnodeidprefix(repo, hexnode)
777 except error.WdirUnsupported: 778 except error.WdirUnsupported: