Improve log message in case of NonPlatformWheel error (#393)

* Improve log message in case of NonPlatformWheel error * Improve message used in case of NonPlatformWheel * Refactoring after review * Refactoring after review
pypa · Oct 9, 2022 · 73c9f17 · 73c9f17
1 parent 72c642c
commit 73c9f17
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -7,9 +7,11 @@ build-backend = "setuptools.build_meta"
 
 [tool.black]
 target-version = ["py36", "py37", "py38", "py39"]
+extend-exclude = "src/auditwheel/_vendor"
 
 [tool.isort]
 profile = "black"
+extend_skip_glob = "src/auditwheel/_vendor/**/*.py"
 
 [tool.mypy]
 follow_imports = "silent"

diff --git a/src/auditwheel/main_addtag.py b/src/auditwheel/main_addtag.py
@@ -30,7 +30,7 @@ def execute(args, p):
     try:
         wheel_abi = analyze_wheel_abi(args.WHEEL_FILE)
     except NonPlatformWheel:
-        logger.info("This does not look like a platform wheel")
+        logger.info(NonPlatformWheel.LOG_MESSAGE)
         return 1
 
     parsed_fname = WHEEL_INFO_RE.search(basename(args.WHEEL_FILE))

diff --git a/src/auditwheel/main_repair.py b/src/auditwheel/main_repair.py
@@ -116,7 +116,7 @@ def execute(args, p):
         try:
             wheel_abi = analyze_wheel_abi(wheel_file)
         except NonPlatformWheel:
-            logger.info("This does not look like a platform wheel")
+            logger.info(NonPlatformWheel.LOG_MESSAGE)
             return 1
 
         policy = get_policy_by_name(args.PLAT)

diff --git a/src/auditwheel/main_show.py b/src/auditwheel/main_show.py
@@ -39,7 +39,7 @@ def execute(args, p):
     try:
         winfo = analyze_wheel_abi(args.WHEEL_FILE)
     except NonPlatformWheel:
-        logger.info("This does not look like a platform wheel")
+        logger.info(NonPlatformWheel.LOG_MESSAGE)
         return 1
 
     libs_with_versions = [

diff --git a/src/auditwheel/wheel_abi.py b/src/auditwheel/wheel_abi.py
@@ -50,6 +50,12 @@ class WheelAbiError(Exception):
 class NonPlatformWheel(WheelAbiError):
     """No ELF binaries in the wheel"""
 
+    LOG_MESSAGE = (
+        "This does not look like a platform wheel, no ELF executable "
+        "or shared library file (including compiled Python C extension) "
+        "found in the wheel archive"
+    )
+
 
 @functools.lru_cache()
 def get_wheel_elfdata(wheel_fn: str):