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

hgext/histedit.py

@@ -199,6 +199,7 b' except ImportError:'
     fcntl = None
     termios = None
 
+import binascii
 import functools
 import os
 import pickle
@@ -504,7 +505,7 b' class histeditaction:'
         # Check for validation of rule ids and get the rulehash
         try:
             rev = bin(ruleid)
-        except TypeError:
+        except binascii.Error:
             try:
                 _ctx = scmutil.revsingle(state.repo, ruleid)
                 rulehash = _ctx.hex()

hgext/largefiles/lfcommands.py

@@ -8,6 +8,7 b''
 
 '''High-level command function for lfconvert, plus the cmdtable.'''
 
+import binascii
 import errno
 import os
 import shutil
@@ -384,7 +385,7 b' def _converttags(ui, revmap, data):'
             continue
         try:
             newid = bin(id)
-        except TypeError:
+        except binascii.Error:
             ui.warn(_(b'skipping incorrectly formatted id %s\n') % id)
             continue
         try:

mercurial/bookmarks.py

@@ -101,8 +101,8 b' class bmstore:'
                                 if nrefs[-2] > refspec:
                                     # bookmarks weren't sorted before 4.5
                                     nrefs.sort()
-                    except (TypeError, ValueError):
-                        # TypeError:
+                    except ValueError:
+                        # binascii.Error (ValueError subclass):
                         # - bin(...)
                         # ValueError:
                         # - node in nm, for non-20-bytes entry

mercurial/debugcommands.py

@@ -2691,9 +2691,9 b' def debugobsolete(ui, repo, precursor=No'
             # local repository.
             n = bin(s)
             if len(n) != repo.nodeconstants.nodelen:
-                raise TypeError()
+                raise ValueError
             return n
-        except TypeError:
+        except ValueError:
             raise error.InputError(
                 b'changeset references must be full hexadecimal '
                 b'node identifiers'

mercurial/node.py

@@ -10,14 +10,7 b' import binascii'
 
 # This ugly style has a noticeable effect in manifest parsing
 hex = binascii.hexlify
-# Adapt to Python 3 API changes. If this ends up showing up in
-# profiles, we can use this version only on Python 3, and forward
-# binascii.unhexlify like we used to on Python 2.
-def bin(s):
-    try:
-        return binascii.unhexlify(s)
-    except binascii.Error as e:
-        raise TypeError(e)
+bin = binascii.unhexlify
 
 
 def short(node):

mercurial/obsolete.py

@@ -68,6 +68,7 b' comment associated with each format for '
 
 """
 
+import binascii
 import errno
 import struct
 
@@ -244,7 +245,7 b' def _fm0readmarkers(data, off, stop):'
                     if len(p) != 20:
                         parents = None
                         break
-            except TypeError:
+            except binascii.Error:
                 # if content cannot be translated to nodeid drop the data.
                 parents = None
 

mercurial/revlog.py

@@ -1487,7 +1487,7 b' class revlog:'
                 node = bin(id)
                 self.rev(node)
                 return node
-            except (TypeError, error.LookupError):
+            except (binascii.Error, error.LookupError):
                 pass
 
     def _partialmatch(self, id):
@@ -1529,7 +1529,7 b' class revlog:'
             l = len(id) // 2 * 2  # grab an even number of digits
             try:
                 prefix = bin(id[:l])
-            except TypeError:
+            except binascii.Error:
                 pass
             else:
                 nl = [e[7] for e in self.index if e[7].startswith(prefix)]

mercurial/revset.py

@@ -6,6 +6,7 b''
 # GNU General Public License version 2 or any later version.
 
 
+import binascii
 import re
 
 from .i18n import _
@@ -1728,7 +1729,7 b' def _node(repo, n):'
             rn = repo.changelog.rev(bin(n))
         except error.WdirUnsupported:
             rn = wdirrev
-        except (LookupError, TypeError):
+        except (binascii.Error, LookupError):
             rn = None
     else:
         try:

mercurial/scmutil.py

@@ -6,6 +6,7 b''
 # GNU General Public License version 2 or any later version.
 
 
+import binascii
 import errno
 import glob
 import os
@@ -639,7 +640,7 b' def revsymbol(repo, symbol):'
                 return repo[rev]
             except error.FilteredLookupError:
                 raise
-            except (TypeError, LookupError):
+            except (binascii.Error, LookupError):
                 pass
 
         # look up bookmarks through the name interface

mercurial/shelve.py

@@ -238,7 +238,7 b' class shelvedstate:'
             d[b'nodestoremove'] = [
                 bin(h) for h in d[b'nodestoremove'].split(b' ')
             ]
-        except (ValueError, TypeError, KeyError) as err:
+        except (ValueError, KeyError) as err:
             raise error.CorruptedState(stringutil.forcebytestr(err))
 
     @classmethod

mercurial/tags.py

@@ -11,6 +11,7 b''
 # tags too.
 
 
+import binascii
 import errno
 import io
 
@@ -303,7 +304,7 b' def _readtaghist(ui, repo, lines, fn, re'
             name = recode(name)
         try:
             nodebin = bin(nodehex)
-        except TypeError:
+        except binascii.Error:
             dbg(b"node '%s' is not well formed" % nodehex)
             continue
 

mercurial/templatefuncs.py

@@ -6,6 +6,7 b''
 # GNU General Public License version 2 or any later version.
 
 
+import binascii
 import re
 
 from .i18n import _
@@ -769,7 +770,7 b' def shortest(context, mapping, args):'
     elif len(hexnode) == hexnodelen:
         try:
             node = bin(hexnode)
-        except TypeError:
+        except binascii.Error:
             return hexnode
     else:
         try:

tests/test-http-bad-server.t

@@ -386,14 +386,10 b' Server sends an incomplete HTTP response'
   > -p $HGPORT -d --pid-file=hg.pid -E error.log
   $ cat hg.pid > $DAEMON_PIDS
 
-TODO client spews a stack due to uncaught ValueError in batch.results()
-#if no-chg
-  $ hg clone http://localhost:$HGPORT/ clone 2> /dev/null
-  [1]
-#else
-  $ hg clone http://localhost:$HGPORT/ clone 2> /dev/null
+  $ hg clone http://localhost:$HGPORT/ clone
+  abort: unexpected response:
+  '96ee1d7354c4ad7372047672'
   [255]
-#endif
 
   $ killdaemons.py $DAEMON_PIDS