diff mercurial/wireprotoserver.py @ 39466:5f4a9ada5ab5

wireprotoserver: use our CBOR encoder

Moving away from the vendored package.

Again, our encoder normalizes keys differently from the vendored
package (for now), hence the test changes.

Differential Revision: https://phab.mercurial-scm.org/D4467

--- a/mercurial/wireprotoserver.py	Tue Aug 28 18:05:08 2018 -0700
+++ b/mercurial/wireprotoserver.py	Tue Aug 28 18:05:48 2018 -0700
@@ -12,9 +12,6 @@
 import threading
 
 from .i18n import _
-from .thirdparty import (
-    cbor,
-)
 from . import (
     encoding,
     error,
@@ -25,6 +22,7 @@
     wireprotov2server,
 )
 from .utils import (
+    cborutil,
     interfaceutil,
     procutil,
 )
@@ -389,7 +387,7 @@
 
     res.status = b'200 OK'
     res.headers[b'Content-Type'] = b'application/mercurial-cbor'
-    res.setbodybytes(cbor.dumps(m, canonical=True))
+    res.setbodybytes(b''.join(cborutil.streamencode(m)))
 
     return True