# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 1522269439 25200
# Node ID 3bc609bcfe774d83f588b1e3dee5ad2e457bf6ae
# Parent  893ff8c3bc575074a8d7238edca2bc72adc1bcf9
cbor: import CBORDecoder and CBOREncoder

And format the imports so it is cleaner.

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

diff -r 893ff8c3bc57 -r 3bc609bcfe77 mercurial/thirdparty/cbor/__init__.py
--- a/mercurial/thirdparty/cbor/__init__.py	Sat Mar 31 10:28:18 2018 +0900
+++ b/mercurial/thirdparty/cbor/__init__.py	Wed Mar 28 13:37:19 2018 -0700
@@ -1,1 +1,10 @@
-from .cbor2 import load, loads, dump, dumps, CBORDecodeError, CBOREncodeError
+from .cbor2 import (
+    CBORDecodeError,
+    CBORDecoder,
+    CBOREncodeError,
+    CBOREncoder,
+    dump,
+    dumps,
+    load,
+    loads,
+)