--- a/contrib/python3-whitelist	Sun Jul 08 19:34:11 2018 +0900
+++ b/contrib/python3-whitelist	Sun Jul 08 19:24:18 2018 +0900
@@ -38,6 +38,7 @@
 test-bundle-vs-outgoing.t
 test-bundle.t
 test-bundle2-exchange.t
+test-bundle2-format.t
 test-bundle2-multiple-changegroups.t
 test-bundle2-pushback.t
 test-cappedreader.py

--- a/mercurial/bundle2.py	Sun Jul 08 19:34:11 2018 +0900
+++ b/mercurial/bundle2.py	Sun Jul 08 19:24:18 2018 +0900
@@ -628,9 +628,10 @@
     def addparam(self, name, value=None):
         """add a stream level parameter"""
         if not name:
-            raise ValueError(r'empty parameter name')
+            raise error.ProgrammingError(b'empty parameter name')
         if name[0:1] not in pycompat.bytestr(string.ascii_letters):
-            raise ValueError(r'non letter first character: %s' % name)
+            raise error.ProgrammingError(b'non letter first character: %s'
+                                         % name)
         self._params.append((name, value))
 
     def addpart(self, part):

--- a/tests/test-bundle2-format.t	Sun Jul 08 19:34:11 2018 +0900
+++ b/tests/test-bundle2-format.t	Sun Jul 08 19:24:18 2018 +0900
@@ -91,8 +91,8 @@
   >         p = p.split(b'=', 1)
   >         try:
   >             bundler.addparam(*p)
-  >         except ValueError as exc:
-  >             raise error.Abort('%s' % exc)
+  >         except error.ProgrammingError as exc:
+  >             raise error.Abort(b'%s' % exc)
   > 
   >     if opts['compress']:
   >         bundler.setcompression(opts['compress'])