From ea3a53aae9f437fe4dcb031561a12add2fe6942a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi>
Date: Fri, 24 Dec 2021 22:20:29 +0200
Subject: Fixed one more distutils import

---
 src/wheel/bdist_wheel.py | 12 +-----------
 src/wheel/util.py        | 12 ++++++++++++
 src/wheel/wheelfile.py   |  6 +++---
 3 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/wheel/bdist_wheel.py b/src/wheel/bdist_wheel.py
index d335952..fd3e2e3 100644
--- a/src/wheel/bdist_wheel.py
+++ b/src/wheel/bdist_wheel.py
@@ -26,6 +26,7 @@ from . import __version__ as wheel_version
 from .macosx_libfile import calculate_macosx_platform_tag
 from .metadata import pkginfo_to_metadata
 from .pkginfo import write_pkg_info
+from .util import log
 from .vendored.packaging import tags
 from .wheelfile import WheelFile
 
@@ -35,17 +36,6 @@ safe_version = pkg_resources.safe_version
 PY_LIMITED_API_PATTERN = r"cp3\d"
 
 
-def log(msg, *, error=False):
-    stream = sys.stderr if error else sys.stdout
-    try:
-        print(msg, file=stream, flush=True)
-    except UnicodeEncodeError:
-        # emulate backslashreplace error handler
-        encoding = stream.encoding
-        msg = msg.encode(encoding, "backslashreplace").decode(encoding)
-        print(msg, file=stream, flush=True)
-
-
 def python_tag():
     return f"py{sys.version_info[0]}"
 
diff --git a/src/wheel/util.py b/src/wheel/util.py
index 09f5b29..1b97175 100644
--- a/src/wheel/util.py
+++ b/src/wheel/util.py
@@ -1,4 +1,5 @@
 import base64
+import sys
 
 
 def native(s, encoding="utf-8"):
@@ -30,3 +31,14 @@ def as_bytes(s):
         return s.encode("utf-8")
     else:
         return s
+
+
+def log(msg, *, error=False):
+    stream = sys.stderr if error else sys.stdout
+    try:
+        print(msg, file=stream, flush=True)
+    except UnicodeEncodeError:
+        # emulate backslashreplace error handler
+        encoding = stream.encoding
+        msg = msg.encode(encoding, "backslashreplace").decode(encoding)
+        print(msg, file=stream, flush=True)
diff --git a/src/wheel/wheelfile.py b/src/wheel/wheelfile.py
index 568322f..1fdd614 100644
--- a/src/wheel/wheelfile.py
+++ b/src/wheel/wheelfile.py
@@ -5,7 +5,6 @@ import re
 import stat
 import time
 from collections import OrderedDict
-from distutils import log as logger
 from io import StringIO, TextIOWrapper
 from zipfile import ZIP_DEFLATED, ZipFile, ZipInfo
 
@@ -13,6 +12,7 @@ from wheel.cli import WheelError
 from wheel.util import (
     as_bytes,
     as_unicode,
+    log,
     native,
     urlsafe_b64decode,
     urlsafe_b64encode,
@@ -126,7 +126,7 @@ class WheelFile(ZipFile):
         return ef
 
     def write_files(self, base_dir):
-        logger.info("creating '%s' and adding '%s' to it", self.filename, base_dir)
+        log(f"creating '{self.filename}' and adding '{base_dir}' to it")
         deferred = []
         for root, dirnames, filenames in os.walk(base_dir):
             # Sort the directory names so that `os.walk` will walk them in a
@@ -166,7 +166,7 @@ class WheelFile(ZipFile):
             if isinstance(zinfo_or_arcname, ZipInfo)
             else zinfo_or_arcname
         )
-        logger.info("adding '%s'", fname)
+        log(f"adding '{fname}'")
         if fname != self.record_path:
             hash_ = self._default_algorithm(bytes)
             self._file_hashes[fname] = hash_.name, native(
-- 
cgit v1.2.1