[Scummvm-git-logs] scummvm master -> 2d2d32aedd504143a39c635572ade87585218bec

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
2d2d32aedd DEVTOOLS: PYCDLIB: Only explicitly pass encoding when it is not None


Commit: 2d2d32aedd504143a39c635572ade87585218bec
    https://github.com/scummvm/scummvm/commit/2d2d32aedd504143a39c635572ade87585218bec
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2026-03-14T19:35:46+02:00

Commit Message:
DEVTOOLS: PYCDLIB: Only explicitly pass encoding when it is not None

Otherwise, we will override the default encodings in the function definitions with None, which will lead to crashes.

Changed paths:
    devtools/contrib/pycdlib/pycdlib/pycdlib.py


diff --git a/devtools/contrib/pycdlib/pycdlib/pycdlib.py b/devtools/contrib/pycdlib/pycdlib/pycdlib.py
index 72489ce640f..d944650e08c 100644
--- a/devtools/contrib/pycdlib/pycdlib/pycdlib.py
+++ b/devtools/contrib/pycdlib/pycdlib/pycdlib.py
@@ -5566,12 +5566,21 @@ class PyCdlib:
             raise pycdlibexception.PyCdlibInvalidInput("Must specify one, and only one of 'iso_path', 'rr_path', 'joliet_path', or 'udf_path'")
 
         if 'joliet_path' in kwargs:
-            return self._get_joliet_entry(self._normalize_joliet_path(kwargs['joliet_path']), kwargs.get("encoding"))
+            path = self._normalize_joliet_path(kwargs['joliet_path'])
+            if 'encoding' in kwargs:
+                return self._get_joliet_entry(path, kwargs['encoding'])
+            return self._get_joliet_entry(path)
         if 'rr_path' in kwargs:
-            return self._get_rr_entry(utils.normpath(kwargs['rr_path']), kwargs.get("encoding"))
+            path = utils.normpath(kwargs['rr_path'])
+            if 'encoding' in kwargs:
+                return self._get_rr_entry(path, kwargs['encoding'])
+            return self._get_rr_entry(path)
         if 'udf_path' in kwargs:
             return self._get_udf_entry(kwargs['udf_path'])
-        return self._get_iso_entry(utils.normpath(kwargs['iso_path']), kwargs.get("encoding"))
+        path = utils.normpath(kwargs['iso_path'])
+        if 'encoding' in kwargs:
+            return self._get_iso_entry(path, kwargs['encoding'])
+        return self._get_iso_entry(path)
 
     def add_isohybrid(self, part_entry=1, mbr_id=None, part_offset=0,
                       geometry_sectors=32, geometry_heads=64, part_type=None,