Allow the "source" param to overridden compare() methods to be given as a positional argument

diffoscope/comparators/apk.py

@@ -136,13 +136,13 @@ class ApkContainer(Archive):
             diff_manifests.add_comment(comment)
         return diff_manifests
 
-    def compare(self, other, **kwargs):
+    def compare(self, other, *args, **kwargs):
         differences = []
         try:
             differences.append(self.compare_manifests(other))
         except AttributeError:  # no apk-specific methods, e.g. MissingArchive
             pass
-        differences.extend(super().compare(other, **kwargs))
+        differences.extend(super().compare(other, *args, **kwargs))
         return differences
 
 class ApkFile(File):

diffoscope/comparators/debian.py

@@ -178,8 +178,8 @@ class DotChangesFile(DebControlFile):
 
         return True
 
-    def compare(self, other, **kwargs):
-        differences = super().compare(other, **kwargs)
+    def compare(self, other, *args, **kwargs):
+        differences = super().compare(other, *args, **kwargs)
 
         if differences is None:
             return None

diffoscope/comparators/debian_fallback.py

@@ -25,8 +25,8 @@ from .text import TextFile
 class DotChangesFile(TextFile):
     RE_FILE_EXTENSION = re.compile(r'\.changes$')
 
-    def compare(self, other, **kwargs):
-        difference = super().compare(other, **kwargs)
+    def compare(self, other, *args, **kwargs):
+        difference = super().compare(other, *args, **kwargs)
         if not difference:
             return None
         difference.add_comment('Unable to find Python debian module. Falling back to text comparison.')
@@ -35,8 +35,8 @@ class DotChangesFile(TextFile):
 class DotDscFile(TextFile):
     RE_FILE_EXTENSION = re.compile(r'\.dsc$')
 
-    def compare(self, other, **kwargs):
-        difference = super().compare(other, **kwargs)
+    def compare(self, other, *args, **kwargs):
+        difference = super().compare(other, *args, **kwargs)
         if not difference:
             return None
         difference.add_comment('Unable to find Python debian module. Falling back to text comparison.')
@@ -45,8 +45,8 @@ class DotDscFile(TextFile):
 class DotBuildinfoFile(TextFile):
     RE_FILE_EXTENSION = re.compile(r'\.buildinfo$')
 
-    def compare(self, other, **kwargs):
-        difference = super().compare(other, **kwargs)
+    def compare(self, other, *args, **kwargs):
+        difference = super().compare(other, *args, **kwargs)
         if not difference:
             return None
         difference.add_comment('Unable to find Python debian module. Falling back to text comparison.')

diffoscope/comparators/ps.py

@@ -39,8 +39,8 @@ class Pstotext(Command):
 class PsFile(TextFile):
     RE_FILE_TYPE = re.compile(r'^PostScript document\b')
 
-    def compare(self, other, **kwargs):
-        differences = super().compare(other, **kwargs)
+    def compare(self, other, *args, **kwargs):
+        differences = super().compare(other, *args, **kwargs)
         details = None
         try:
             details = Difference.from_command(Pstotext, self.path, other.path)