--- 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,
+)