diffoscope 259__tar.gz → 261__tar.gz

{diffoscope-259 → diffoscope-261}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diffoscope
-Version: 259
+Version: 261
 Summary: in-depth comparison of files, archives, and directories
 Home-page: https://diffoscope.org/
 Author: Diffoscope developers

{diffoscope-259 → diffoscope-261}/debian/changelog

@@ -1,8 +1,31 @@
-diffoscope (260) UNRELEASED; urgency=medium
+diffoscope (262) UNRELEASED; urgency=medium
 
   * WIP (generated upon release).
 
- -- Chris Lamb <lamby@debian.org>  Fri, 01 Mar 2024 09:39:44 +0000
+ -- Chris Lamb <lamby@debian.org>  Fri, 22 Mar 2024 09:43:30 +0000
+
+diffoscope (261) unstable; urgency=medium
+
+  [ Chris Lamb ]
+  * Don't crash if we encounter an .rdb file without an equivalent .rdx file.
+    (Closes: #1066991)
+  * In addition, don't identify Redis database dumps (etc.) as GNU R database
+    files based simply on their filename. (Re: #1066991)
+  * Update copyright years.
+
+ -- Chris Lamb <lamby@debian.org>  Fri, 22 Mar 2024 09:42:15 +0000
+
+diffoscope (260) unstable; urgency=medium
+
+  [ Chris Lamb ]
+  * Actually test 7z support in the test_7z set of tests, not the lz4
+    functionality. (Closes: reproducible-builds/diffoscope#359)
+  * In addition, correctly check for the 7z binary being available
+    (and not lz4) when testing 7z.
+  * Prevent a traceback when comparing a contentful .pyc file with an
+    empty one. (Re: Debian:#1064973)
+
+ -- Chris Lamb <lamby@debian.org>  Fri, 08 Mar 2024 11:07:49 +0000
 
 diffoscope (259) unstable; urgency=medium
 

{diffoscope-259 → diffoscope-261}/diffoscope/__init__.py

@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
-VERSION = "259"
+VERSION = "261"

{diffoscope-259 → diffoscope-261}/diffoscope/comparators/__init__.py

@@ -3,7 +3,7 @@
 #
 # Copyright © 2014-2015 Jérémy Bobbio <lunar@debian.org>
 # Copyright ©      2015  Helmut Grohne <helmut@subdivi.de>
-# Copyright © 2015-2023 Chris Lamb <lamby@debian.org>
+# Copyright © 2015-2024 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -75,7 +75,7 @@ class ComparatorManager:
         ("ffprobe.FfprobeFile",),
         ("gnumeric.GnumericFile",),
         ("gzip.GzipFile",),
-        ("7z.SevenZFile",),
+        ("sevenz.SevenZFile",),
         ("haskell.HiFile",),
         ("icc.IccFile",),
         ("iso9660.Iso9660File",),

{diffoscope-259 → diffoscope-261}/diffoscope/comparators/python.py

@@ -21,6 +21,7 @@ import binascii
 import dis
 import io
 import marshal
+import os
 import re
 import struct
 import time
@@ -66,6 +67,12 @@ def describe_pyc(filename):
 
 
 def parse_pyc(f):
+    f.seek(0, io.SEEK_END)
+    if f.tell() == 0:
+        yield "type:     empty"
+        return
+
+    f.seek(0)
     magic = f.read(4)
     yield "magic:    {}".format(hexlify(magic))
 

{diffoscope-259 → diffoscope-261}/diffoscope/comparators/rdata.py

@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2017 Ximin Luo <infinity0@debian.org>
-# Copyright © 2017-2021 Chris Lamb <lamby@debian.org>
+# Copyright © 2017-2021, 2024 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -96,12 +96,20 @@ def get_module_path_for_rdb(rdb, temp_dir, module_name):
     rdx_name = "{}.rdx".format(os.path.splitext(rdb.name)[0])
 
     # Query the container for the full path (eg. `./path/to/foo.rdx`)...
-    rdx = rdb.container.get_member(rdx_name)
+    try:
+        rdx = rdb.container.get_member(rdx_name)
+    except KeyError:
+        # There is no guarantee that the equivalent .rdx file exists.
+        # (see Debian:#1066991)
+        return None
 
     if not os.path.exists(rdx.path):
         # ... falling back to looking in the same directory for when
         # comparing two .rdb files directly
-        rdx = rdb.container.get_member(os.path.basename(rdx_name))
+        try:
+            rdx = rdb.container.get_member(os.path.basename(rdx_name))
+        except KeyError:
+            return None
 
     if not os.path.exists(rdx.path):
         # Corresponding .rdx does not exist
@@ -161,6 +169,17 @@ class RdbFile(File):
     DESCRIPTION = "GNU R database files (.rdb)"
     FILE_EXTENSION_SUFFIX = {".rdb"}
 
+    @classmethod
+    def recognizes(cls, file):
+        if not super().recognizes(file):
+            return False
+
+        # file(1) does not yet support identifying R database files, so we
+        # match on "data" AND the filename ends with .rdb (via
+        # FILE_EXTENSION_SUFFIX above) to avoid matching, say, Redis database
+        # dumps (dump.rdb).
+        return file.magic_file_type == "data"
+
     def compare_details(self, other, source=None):
         with get_temporary_directory(suffix="rdb") as tmpdir:
             a = get_module_path_for_rdb(self, tmpdir, "a")

diffoscope-259/diffoscope/comparators/7z.py → diffoscope-261/diffoscope/comparators/sevenz.py

@@ -1,7 +1,7 @@
 #
 # diffoscope: in-depth comparison of files, archives, and directories
 #
-# Copyright © 2023 Chris Lamb <lamby@debian.org>
+# Copyright © 2024 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

{diffoscope-259 → diffoscope-261}/diffoscope.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diffoscope
-Version: 259
+Version: 261
 Summary: in-depth comparison of files, archives, and directories
 Home-page: https://diffoscope.org/
 Author: Diffoscope developers

{diffoscope-259 → diffoscope-261}/diffoscope.egg-info/SOURCES.txt

@@ -61,7 +61,6 @@ diffoscope.egg-info/dependency_links.txt
 diffoscope.egg-info/entry_points.txt
 diffoscope.egg-info/requires.txt
 diffoscope.egg-info/top_level.txt
-diffoscope/comparators/7z.py
 diffoscope/comparators/__init__.py
 diffoscope/comparators/android.py
 diffoscope/comparators/apk.py
@@ -127,6 +126,7 @@ diffoscope/comparators/rdata.py
 diffoscope/comparators/rpm.py
 diffoscope/comparators/rpm_fallback.py
 diffoscope/comparators/rust.py
+diffoscope/comparators/sevenz.py
 diffoscope/comparators/socket_or_fifo.py
 diffoscope/comparators/sphinx.py
 diffoscope/comparators/sqlite.py
@@ -186,7 +186,6 @@ tests/test_source.py
 tests/test_tools.py
 tests/test_versions.py
 tests/comparators/__init__.py
-tests/comparators/test_7z.py
 tests/comparators/test_android.py
 tests/comparators/test_apk.py
 tests/comparators/test_archive.py
@@ -250,6 +249,7 @@ tests/comparators/test_python.py
 tests/comparators/test_rdata.py
 tests/comparators/test_rlib.py
 tests/comparators/test_rpm.py
+tests/comparators/test_sevenz.py
 tests/comparators/test_sockets.py
 tests/comparators/test_sphinx.py
 tests/comparators/test_sqlite.py
@@ -476,6 +476,7 @@ tests/data/test1.deb
 tests/data/test1.debsrc.tar.gz
 tests/data/test1.debug
 tests/data/test1.dex
+tests/data/test1.disk.gz
 tests/data/test1.docx
 tests/data/test1.dsc
 tests/data/test1.epub
@@ -544,6 +545,7 @@ tests/data/test2.deb
 tests/data/test2.debsrc.tar.gz
 tests/data/test2.debug
 tests/data/test2.dex
+tests/data/test2.disk.gz
 tests/data/test2.docx
 tests/data/test2.dsc
 tests/data/test2.epub
@@ -632,6 +634,7 @@ tests/data/text_iso8859_expected_diff
 tests/data/text_order1
 tests/data/text_order2
 tests/data/text_order_expected_diff
+tests/data/text_sevenzmetadata_expected_diff
 tests/data/text_unicode1
 tests/data/text_unicode2
 tests/data/text_unicode_binary_fallback

diffoscope-261/tests/comparators/test_sevenz.py

@@ -0,0 +1,78 @@
+#
+# diffoscope: in-depth comparison of files, archives, and directories
+#
+# Copyright © 2024 Chris Lamb <lamby@debian.org>
+#
+# diffoscope is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# diffoscope is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
+
+import shutil
+import pytest
+
+from diffoscope.comparators.gzip import GzipFile
+from diffoscope.comparators.sevenz import SevenZFile
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.utils.specialize import specialize
+
+from ..utils.data import load_fixture, assert_diff
+from ..utils.tools import skip_unless_tools_exist
+from ..utils.nonexisting import assert_non_existing
+
+sevenza = load_fixture("test1.disk.gz")
+sevenzb = load_fixture("test2.disk.gz")
+
+
+def test_identification(sevenza):
+    assert isinstance(sevenza, GzipFile)
+
+
+def test_no_differences(sevenza):
+    difference = sevenza.compare(sevenza)
+    assert difference is None
+
+
+@pytest.fixture
+def differences(sevenza, sevenzb):
+    return sevenza.compare(sevenzb).details
+
+
+@skip_unless_tools_exist("7z")
+def test_content_source(differences):
+    # We gzip our test data image, so we need to go one level deeper.
+    assert differences[0].source1 == "test1.disk"
+    assert differences[0].source2 == "test2.disk"
+    assert differences[0].details[0].source1 == "7z l"
+    assert differences[0].details[0].source2 == "7z l"
+
+
+@skip_unless_tools_exist("7z")
+def test_content_source_without_extension(tmpdir, sevenza, sevenzb):
+    path1 = str(tmpdir.join("test1"))
+    path2 = str(tmpdir.join("test2"))
+    shutil.copy(sevenza.path, path1)
+    shutil.copy(sevenzb.path, path2)
+    sevenza = specialize(FilesystemFile(path1))
+    sevenzb = specialize(FilesystemFile(path2))
+    difference = sevenza.compare(sevenzb).details
+    assert difference[0].source1 == "test1-content"
+    assert difference[0].source2 == "test2-content"
+
+
+@skip_unless_tools_exist("7z")
+def test_metadata_diff(differences):
+    assert_diff(differences[0].details[0], "text_sevenzmetadata_expected_diff")
+
+
+@skip_unless_tools_exist("7z")
+def test_compare_non_existing(monkeypatch, sevenza):
+    assert_non_existing(monkeypatch, sevenza)

diffoscope-261/tests/data/text_sevenzmetadata_expected_diff

@@ -0,0 +1,15 @@
+@@ -5,13 +5,13 @@
+ Scanning the drive for archives:
+ 1 file, 131072 bytes (128 KiB)
+ 
+ 
+ --
+ Type = GPT
+ Physical Size = 131072
+-ID = BEFEFA22-EED4-4977-8407-46CD48ABC5D9
++ID = A2E15781-E1B6-422C-BA65-9210D36BE3AA
+ 
+    Date      Time    Attr         Size   Compressed  Name
+ ------------------- ----- ------------ ------------  ------------------------
+ ------------------- ----- ------------ ------------  ------------------------
+                                      0            0  0 files

diffoscope-259/tests/comparators/test_7z.py

@@ -1,74 +0,0 @@
-#
-# diffoscope: in-depth comparison of files, archives, and directories
-#
-# Copyright © 2023 Chris Lamb <lamby@debian.org>
-#
-# diffoscope is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# diffoscope is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
-
-import shutil
-import pytest
-
-from diffoscope.comparators.lz4 import Lz4File
-from diffoscope.comparators.binary import FilesystemFile
-from diffoscope.comparators.utils.specialize import specialize
-
-from ..utils.data import load_fixture, assert_diff
-from ..utils.tools import skip_unless_tools_exist
-from ..utils.nonexisting import assert_non_existing
-
-lz4a = load_fixture("test1.lz4")
-lz4b = load_fixture("test2.lz4")
-
-
-def test_identification(lz4a):
-    assert isinstance(lz4a, Lz4File)
-
-
-def test_no_differences(lz4a):
-    difference = lz4a.compare(lz4a)
-    assert difference is None
-
-
-@pytest.fixture
-def differences(lz4a, lz4b):
-    return lz4a.compare(lz4b).details
-
-
-@skip_unless_tools_exist("lz4")
-def test_content_source(differences):
-    assert differences[0].source1 == "test1"
-    assert differences[0].source2 == "test2"
-
-
-@skip_unless_tools_exist("lz4")
-def test_content_source_without_extension(tmpdir, lz4a, lz4b):
-    path1 = str(tmpdir.join("test1"))
-    path2 = str(tmpdir.join("test2"))
-    shutil.copy(lz4a.path, path1)
-    shutil.copy(lz4b.path, path2)
-    lz4a = specialize(FilesystemFile(path1))
-    lz4b = specialize(FilesystemFile(path2))
-    difference = lz4a.compare(lz4b).details
-    assert difference[0].source1 == "test1-content"
-    assert difference[0].source2 == "test2-content"
-
-
-@skip_unless_tools_exist("lz4")
-def test_content_diff(differences):
-    assert_diff(differences[0], "text_ascii_expected_diff")
-
-
-@skip_unless_tools_exist("lz4")
-def test_compare_non_existing(monkeypatch, lz4a):
-    assert_non_existing(monkeypatch, lz4a)