From abda1a446337a7cb46aa82b72e329a681f79a9eb Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sun, 12 May 2019 22:40:03 +0200
Subject: [PATCH] patch msgpack to use relative imports

patch by felix schwarz, thanks!
---
 src/borg/_msgpack/__init__.py     | 12 ++++++------
 src/borg/_msgpack/_packer.pyx     |  4 ++--
 src/borg/_msgpack/_unpacker.pyx   |  4 ++--
 src/borg/_msgpack/fallback.py     |  4 ++--
 src/borg/_msgpack/unpack_define.h |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/borg/_msgpack/__init__.py b/src/borg/_msgpack/__init__.py
index 3955a4143..3a3cf3a5d 100644
--- a/src/borg/_msgpack/__init__.py
+++ b/src/borg/_msgpack/__init__.py
@@ -1,6 +1,6 @@
 # coding: utf-8
-from msgpack._version import version
-from msgpack.exceptions import *
+from ._version import version
+from .exceptions import *
 
 from collections import namedtuple
 
@@ -19,13 +19,13 @@ class ExtType(namedtuple('ExtType', 'code data')):
 
 import os
 if os.environ.get('MSGPACK_PUREPYTHON'):
-    from msgpack.fallback import Packer, unpackb, Unpacker
+    from .fallback import Packer, unpackb, Unpacker
 else:
     try:
-        from msgpack._packer import Packer
-        from msgpack._unpacker import unpackb, Unpacker
+        from ._packer import Packer
+        from ._unpacker import unpackb, Unpacker
     except ImportError:
-        from msgpack.fallback import Packer, unpackb, Unpacker
+        from .fallback import Packer, unpackb, Unpacker
 
 
 def pack(o, stream, **kwargs):
diff --git a/src/borg/_msgpack/_packer.pyx b/src/borg/_msgpack/_packer.pyx
index 225f24aec..c490a5b6c 100644
--- a/src/borg/_msgpack/_packer.pyx
+++ b/src/borg/_msgpack/_packer.pyx
@@ -5,8 +5,8 @@ from cpython cimport *
 from cpython.version cimport PY_MAJOR_VERSION
 from cpython.exc cimport PyErr_WarnEx
 
-from msgpack.exceptions import PackValueError, PackOverflowError
-from msgpack import ExtType
+from .exceptions import PackValueError, PackOverflowError
+from . import ExtType
 
 
 cdef extern from "Python.h":
diff --git a/src/borg/_msgpack/_unpacker.pyx b/src/borg/_msgpack/_unpacker.pyx
index d7fa5bc6c..0abd9c101 100644
--- a/src/borg/_msgpack/_unpacker.pyx
+++ b/src/borg/_msgpack/_unpacker.pyx
@@ -32,13 +32,13 @@ from libc.string cimport *
 from libc.limits cimport *
 ctypedef unsigned long long uint64_t
 
-from msgpack.exceptions import (
+from .exceptions import (
     BufferFull,
     OutOfData,
     UnpackValueError,
     ExtraData,
 )
-from msgpack import ExtType
+from . import ExtType
 
 
 cdef extern from "unpack.h":
diff --git a/src/borg/_msgpack/fallback.py b/src/borg/_msgpack/fallback.py
index c0e5fd663..fd01bf825 100644
--- a/src/borg/_msgpack/fallback.py
+++ b/src/borg/_msgpack/fallback.py
@@ -49,7 +49,7 @@ else:
     newlist_hint = lambda size: []
 
 
-from msgpack.exceptions import (
+from .exceptions import (
     BufferFull,
     OutOfData,
     UnpackValueError,
@@ -57,7 +57,7 @@ from msgpack.exceptions import (
     PackOverflowError,
     ExtraData)
 
-from msgpack import ExtType
+from . import ExtType
 
 
 EX_SKIP                 = 0
diff --git a/src/borg/_msgpack/unpack_define.h b/src/borg/_msgpack/unpack_define.h
index 0dd708d17..d681277bb 100644
--- a/src/borg/_msgpack/unpack_define.h
+++ b/src/borg/_msgpack/unpack_define.h
@@ -18,7 +18,7 @@
 #ifndef MSGPACK_UNPACK_DEFINE_H__
 #define MSGPACK_UNPACK_DEFINE_H__
 
-#include "msgpack/sysdep.h"
+#include "sysdep.h"
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>