Exception message formatting updates and refactor simplifying

pyproject.toml

@@ -212,6 +212,7 @@ no-cover-if-is-macos = "'darwin' == os_environ.get('COVERAGE_PLATFORM', sys_plat
 no-cover-if-not-macos = "'darwin' != os_environ.get('COVERAGE_PLATFORM', sys_platform) and os_environ.get('COVERAGE_EXCLUDE_PLATFORM') != 'disable'"
 no-cover-if-is-windows = "'win32' == os_environ.get('COVERAGE_PLATFORM', sys_platform) and os_environ.get('COVERAGE_EXCLUDE_PLATFORM') != 'disable'"
 no-cover-if-not-windows = "'win32' != os_environ.get('COVERAGE_PLATFORM', sys_platform) and os_environ.get('COVERAGE_EXCLUDE_PLATFORM') != 'disable'"
+no-cover-if-gte-py312 = "sys_version_info > (3, 12) and os_environ.get('COVERAGE_EXCLUDE_PYTHON_VERSION') != 'disable'"
 no-cover-if-is-py312 = "python_version == '3.12' and os_environ.get('COVERAGE_EXCLUDE_PYTHON_VERSION') != 'disable'"
 no-cover-if-lt-py312 = "sys_version_info < (3, 12) and os_environ.get('COVERAGE_EXCLUDE_PYTHON_VERSION') != 'disable'"
 no-cover-if-lt-py311 = "sys_version_info < (3, 11) and os_environ.get('COVERAGE_EXCLUDE_PYTHON_VERSION') != 'disable'"

src/briefcase/exceptions.py

@@ -34,7 +34,7 @@ def __init__(self, requested, choices):
 
     def __str__(self):
         choices = ", ".join(sorted(self.choices, key=str.lower))
-        return f"Invalid format '{self.requested}'; (choose from: {choices})"
+        return f"Invalid format {self.requested!r}; (choose from: {choices})"
 
 
 class UnsupportedCommandError(BriefcaseError):
@@ -156,18 +156,18 @@ def __init__(self, platform):
 class InvalidSupportPackage(BriefcaseCommandError):
     def __init__(self, filename):
         self.filename = filename
-        super().__init__(f"Unable to unpack support package '{filename}'.")
+        super().__init__(f"Unable to unpack support package {str(filename)!r}.")
 
 
 class InvalidStubBinary(BriefcaseCommandError):
     def __init__(self, filename):
         self.filename = filename
-        super().__init__(f"Unable to unpack or copy stub binary '{filename}'.")
+        super().__init__(f"Unable to unpack or copy stub binary {str(filename)!r}.")
 
 
 class MissingAppMetadata(BriefcaseCommandError):
     def __init__(self, app_bundle_path):
-        super().__init__(f"Unable to find '{app_bundle_path / 'briefcase.toml'}'")
+        super().__init__(f"Unable to find {str(app_bundle_path / 'briefcase.toml')!r}")
 
 
 class MissingSupportPackage(BriefcaseCommandError):
@@ -229,7 +229,7 @@ class InvalidDeviceError(BriefcaseCommandError):
     def __init__(self, id_type, device):
         self.id_type = id_type
         self.device = device
-        super().__init__(msg=f"Invalid device {id_type} '{device}'")
+        super().__init__(msg=f"Invalid device {id_type} {device!r}")
 
 
 class CorruptToolError(BriefcaseCommandError):

src/briefcase/integrations/file.py

@@ -71,35 +71,31 @@ def unpack_archive(
     ):
         """Unpack an archive file in to a destination directory.
 
+        Additional protections for unpacking tar files were introduced in Python 3.12.
+        Since tarballs can contain anything valid in a UNIX file system, these
+        protections prevent unpacking potentially dangerous files. This behavior will be
+        the default in Python 3.14. However, the protections can only be enabled for tar
+        files...not zip files.
+
         :param filename: File path for the archive
         :param extract_dir: Target file path for where to unpack archive
         :param kwargs: additional arguments for shutil.unpack_archive
         """
+        is_zip = Path(filename).suffix == ".zip"
+        if sys.version_info >= (3, 12):  # pragma: no-cover-if-lt-py312
+            unpack_kwargs = {"filter": "data"} if not is_zip else {}
+        else:  # pragma: no-cover-if-gte-py312
+            unpack_kwargs = {}
+
         self.tools.shutil.unpack_archive(
             filename=filename,
             extract_dir=extract_dir,
             **{
-                **self._unpack_archive_kwargs(filename),
+                **unpack_kwargs,
                 **kwargs,
             },
         )
 
-    def _unpack_archive_kwargs(self, archive_path: str | os.PathLike) -> dict[str, str]:
-        """Additional options for unpacking archives based on the archive's type.
-
-        Additional protections for unpacking tar files were introduced in Python 3.12.
-        Since tarballs can contain anything valid in a UNIX file system, these
-        protections prevent unpacking potentially dangerous files. This behavior will be
-        the default in Python 3.14. However, the protections can only be enabled for tar
-        files...not zip files.
-        """
-        is_zip = Path(archive_path).suffix == ".zip"
-        if sys.version_info >= (3, 12) and not is_zip:  # pragma: no-cover-if-lt-py312
-            unpack_kwargs = {"filter": "data"}
-        else:
-            unpack_kwargs = {}
-        return unpack_kwargs
-
     def download(self, url: str, download_path: Path, role: str | None = None) -> Path:
         """Download a given URL, caching it. If it has already been downloaded, return
         the value that has been cached.