[Git][reproducible-builds/diffoscope][master] Support androguard 4 and previous versions. Thanks, linsui! (Closes: Debian:#1140016)

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
2b17885b by Chris Lamb at 2026-06-15T08:58:59-07:00
Support androguard 4 and previous versions. Thanks, linsui! (Closes: Debian:#1140016)

- - - - -


1 changed file:

- diffoscope/comparators/apk.py


Changes:

=====================================
diffoscope/comparators/apk.py
=====================================
@@ -320,7 +320,10 @@ class ApkFile(ZipFileBase):
 
 
 def get_v2_signing_keys(path):
-    from androguard.core.bytecodes import apk
+    try:
+        from androguard.core import apk  # Version >=4
+    except ImportError:
+        from androguard.core.bytecodes import apk  # Version < 4
 
     try:
         instance = apk.APK(path)



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/2b17885b29ce27b13e90f1157df1f173a316663d

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/2b17885b29ce27b13e90f1157df1f173a316663d
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20260615/a4a98965/attachment.htm>