Merge pull request #100 from MPIB/fix_friendly_name_decode

Fix handling bytes-like product-name from ioreg
salopensource · Apr 7, 2022 · 266b64b · 266b64b
2 parents 5d2bb20 + 5abda24
commit 266b64b
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/payload/usr/local/sal/checkin_modules/machine_checkin.py b/payload/usr/local/sal/checkin_modules/machine_checkin.py
@@ -126,9 +126,8 @@ def get_friendly_model(serial, udid):
                 return (
                     data[0]
                     .get("product-name")
-                    .encode("ascii", "ignore")
-                    .decode()
-                    .strip()
+                    .decode("ascii", "ignore")
+                    .strip().strip('\x00').strip()
                 )
         except:
             pass