From e403d7cffcd95bd91443e2a52c44f5057b6a295d Mon Sep 17 00:00:00 2001
From: Jeremy Volkman <jeremy@jvolkman.com>
Date: Mon, 5 Feb 2024 17:28:38 -0800
Subject: [PATCH] Use relative imports to make vendoring easier

---
 delocate/cmd/common.py            | 4 ++--
 delocate/cmd/delocate_addplat.py  | 4 ++--
 delocate/cmd/delocate_fuse.py     | 4 ++--
 delocate/cmd/delocate_listdeps.py | 8 ++++----
 delocate/cmd/delocate_patch.py    | 4 ++--
 delocate/cmd/delocate_path.py     | 4 ++--
 delocate/cmd/delocate_wheel.py    | 4 ++--
 delocate/libsana.py               | 4 ++--
 delocate/wheeltools.py            | 3 +--
 9 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/delocate/cmd/common.py b/delocate/cmd/common.py
index d4457e43..f0c26a9b 100644
--- a/delocate/cmd/common.py
+++ b/delocate/cmd/common.py
@@ -14,8 +14,8 @@
 
 from typing_extensions import Literal, TypedDict
 
-from delocate import __version__
-from delocate.delocating import filter_system_libs
+from .. import __version__
+from ..delocating import filter_system_libs
 
 logger = logging.getLogger(__name__)
 
diff --git a/delocate/cmd/delocate_addplat.py b/delocate/cmd/delocate_addplat.py
index f858fe3d..df0fef01 100755
--- a/delocate/cmd/delocate_addplat.py
+++ b/delocate/cmd/delocate_addplat.py
@@ -21,8 +21,8 @@
 from os.path import expanduser, realpath
 from os.path import join as exists
 
-from delocate.cmd.common import common_parser, glob_paths, verbosity_config
-from delocate.wheeltools import WheelToolsError, add_platforms
+from ..cmd.common import common_parser, glob_paths, verbosity_config
+from ..wheeltools import WheelToolsError, add_platforms
 
 parser = ArgumentParser(description=__doc__, parents=[common_parser])
 parser.add_argument(
diff --git a/delocate/cmd/delocate_fuse.py b/delocate/cmd/delocate_fuse.py
index 80d46a12..e6025cc2 100755
--- a/delocate/cmd/delocate_fuse.py
+++ b/delocate/cmd/delocate_fuse.py
@@ -10,8 +10,8 @@
 from os.path import abspath, basename, expanduser
 from os.path import join as pjoin
 
-from delocate.cmd.common import common_parser, verbosity_config
-from delocate.fuse import fuse_wheels
+from ..cmd.common import common_parser, verbosity_config
+from ..fuse import fuse_wheels
 
 parser = ArgumentParser(description=__doc__, parents=[common_parser])
 parser.add_argument(
diff --git a/delocate/cmd/delocate_listdeps.py b/delocate/cmd/delocate_listdeps.py
index e9bc6911..558adc41 100755
--- a/delocate/cmd/delocate_listdeps.py
+++ b/delocate/cmd/delocate_listdeps.py
@@ -9,10 +9,10 @@
 from os.path import isdir, realpath
 from os.path import sep as psep
 
-from delocate import wheel_libs
-from delocate.cmd.common import common_parser, glob_paths, verbosity_config
-from delocate.delocating import filter_system_libs
-from delocate.libsana import stripped_lib_dict, tree_libs_from_directory
+from .. import wheel_libs
+from ..cmd.common import common_parser, glob_paths, verbosity_config
+from ..delocating import filter_system_libs
+from ..libsana import stripped_lib_dict, tree_libs_from_directory
 
 parser = ArgumentParser(description=__doc__, parents=[common_parser])
 parser.add_argument(
diff --git a/delocate/cmd/delocate_patch.py b/delocate/cmd/delocate_patch.py
index 07c2f7d3..3ea52e00 100755
--- a/delocate/cmd/delocate_patch.py
+++ b/delocate/cmd/delocate_patch.py
@@ -11,8 +11,8 @@
 from os.path import basename, exists, expanduser
 from os.path import join as pjoin
 
-from delocate import patch_wheel
-from delocate.cmd.common import common_parser, verbosity_config
+from .. import patch_wheel
+from ..cmd.common import common_parser, verbosity_config
 
 parser = ArgumentParser(description=__doc__, parents=[common_parser])
 parser.add_argument(
diff --git a/delocate/cmd/delocate_path.py b/delocate/cmd/delocate_path.py
index a2dd101e..8e303ea5 100755
--- a/delocate/cmd/delocate_path.py
+++ b/delocate/cmd/delocate_path.py
@@ -7,8 +7,8 @@
 import os
 from argparse import ArgumentParser
 
-from delocate import delocate_path
-from delocate.cmd.common import (
+from .. import delocate_path
+from ..cmd.common import (
     common_parser,
     delocate_parser,
     delocate_values,
diff --git a/delocate/cmd/delocate_wheel.py b/delocate/cmd/delocate_wheel.py
index ebf29188..e28aac30 100755
--- a/delocate/cmd/delocate_wheel.py
+++ b/delocate/cmd/delocate_wheel.py
@@ -12,8 +12,8 @@
 from os.path import join as pjoin
 from typing import List, Optional, Text
 
-from delocate import delocate_wheel
-from delocate.cmd.common import (
+from .. import delocate_wheel
+from ..cmd.common import (
     common_parser,
     delocate_parser,
     delocate_values,
diff --git a/delocate/libsana.py b/delocate/libsana.py
index 3cde5ca2..70c8cdf0 100644
--- a/delocate/libsana.py
+++ b/delocate/libsana.py
@@ -21,7 +21,7 @@
     Tuple,
 )
 
-import delocate.delocating
+from . import delocating
 
 from .tmpdirs import TemporaryDirectory
 from .tools import (
@@ -317,7 +317,7 @@ def _tree_libs_from_libraries(
     if missing_libs and not ignore_missing:
         # get_dependencies will already have logged details of missing
         # libraries.
-        raise delocate.delocating.DelocationError(
+        raise delocating.DelocationError(
             "Could not find all dependencies."
         )
 
diff --git a/delocate/wheeltools.py b/delocate/wheeltools.py
index 575f0326..41c2280c 100644
--- a/delocate/wheeltools.py
+++ b/delocate/wheeltools.py
@@ -17,8 +17,7 @@
 
 from packaging.utils import parse_wheel_filename
 
-from delocate.pkginfo import read_pkg_info, write_pkg_info
-
+from .pkginfo import read_pkg_info, write_pkg_info
 from .tmpdirs import InTemporaryDirectory
 from .tools import dir2zip, open_rw, unique_by_index, zip2dir