diff --git a/mercurial/thirdparty/cbor/__init__.py b/mercurial/thirdparty/cbor/__init__.py
new file mode 100644
--- /dev/null
+++ b/mercurial/thirdparty/cbor/__init__.py
@@ -0,0 +1 @@
+from cbor2 import load, dump, CBORDecodeError, CBOREncodeError
diff --git a/mercurial/thirdparty/cbor/cbor2/__init__.py b/mercurial/thirdparty/cbor/cbor2/__init__.py
--- a/mercurial/thirdparty/cbor/cbor2/__init__.py
+++ b/mercurial/thirdparty/cbor/cbor2/__init__.py
@@ -1,3 +1,3 @@
-from cbor2.decoder import load, loads, CBORDecoder, CBORDecodeError  # noqa
-from cbor2.encoder import dump, dumps, CBOREncoder, CBOREncodeError, shareable_encoder  # noqa
-from cbor2.types import CBORTag, CBORSimpleValue, undefined  # noqa
+from .decoder import load, loads, CBORDecoder, CBORDecodeError  # noqa
+from .encoder import dump, dumps, CBOREncoder, CBOREncodeError, shareable_encoder  # noqa
+from .types import CBORTag, CBORSimpleValue, undefined  # noqa
diff --git a/mercurial/thirdparty/cbor/cbor2/decoder.py b/mercurial/thirdparty/cbor/cbor2/decoder.py
--- a/mercurial/thirdparty/cbor/cbor2/decoder.py
+++ b/mercurial/thirdparty/cbor/cbor2/decoder.py
@@ -3,8 +3,8 @@
 from datetime import datetime, timedelta
 from io import BytesIO
 
-from cbor2.compat import timezone, xrange, byte_as_integer, unpack_float16
-from cbor2.types import CBORTag, undefined, break_marker, CBORSimpleValue
+from .compat import timezone, xrange, byte_as_integer, unpack_float16
+from .types import CBORTag, undefined, break_marker, CBORSimpleValue
 
 timestamp_re = re.compile(r'^(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)'
                           r'(?:\.(\d+))?(?:Z|([+-]\d\d):(\d\d))$')
diff --git a/mercurial/thirdparty/cbor/cbor2/encoder.py b/mercurial/thirdparty/cbor/cbor2/encoder.py
--- a/mercurial/thirdparty/cbor/cbor2/encoder.py
+++ b/mercurial/thirdparty/cbor/cbor2/encoder.py
@@ -6,9 +6,9 @@
 from datetime import datetime, date, time
 from io import BytesIO
 
-from cbor2.compat import iteritems, timezone, long, unicode, as_unicode, bytes_from_list
-from cbor2.compat import pack_float16, unpack_float16
-from cbor2.types import CBORTag, undefined, CBORSimpleValue
+from .compat import iteritems, timezone, long, unicode, as_unicode, bytes_from_list
+from .compat import pack_float16, unpack_float16
+from .types import CBORTag, undefined, CBORSimpleValue
 
 
 class CBOREncodeError(Exception):