# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 1535494256 25200
# Node ID cdb56f295b031ace8a12bc5a08a6e8a4e2da6a66
# Parent  45d12c49c3f3e1b5feaf418f5698327a09357112
httppeer: use our CBOR decoder

We just implemented our own CBOR decoder. Let's use it in
httppeer.

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

diff -r 45d12c49c3f3 -r cdb56f295b03 mercurial/httppeer.py
--- a/mercurial/httppeer.py	Wed Aug 22 09:02:07 2018 +0800
+++ b/mercurial/httppeer.py	Tue Aug 28 15:10:56 2018 -0700
@@ -16,9 +16,6 @@
 import weakref
 
 from .i18n import _
-from .thirdparty import (
-    cbor,
-)
 from . import (
     bundle2,
     error,
@@ -35,6 +32,7 @@
     wireprotov2server,
 )
 from .utils import (
+    cborutil,
     interfaceutil,
     stringutil,
 )
@@ -913,8 +911,8 @@
     if advertisev2:
         if ct == 'application/mercurial-cbor':
             try:
-                info = cbor.loads(rawdata)
-            except cbor.CBORDecodeError:
+                info = cborutil.decodeall(rawdata)[0]
+            except cborutil.CBORDecodeError:
                 raise error.Abort(_('error decoding CBOR from remote server'),
                                   hint=_('try again and consider contacting '
                                          'the server operator'))