diffoscope 313__tar.gz → 315__tar.gz

{diffoscope-313/diffoscope.egg-info → diffoscope-315}/PKG-INFO

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

{diffoscope-313 → diffoscope-315}/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 = "313"
+VERSION = "315"

{diffoscope-313 → diffoscope-315}/diffoscope/comparators/__init__.py

@@ -26,7 +26,6 @@ import traceback
 from ..tools import python_module_missing
 from ..logging import line_eraser
 
-
 logger = logging.getLogger(__name__)
 
 

{diffoscope-313 → diffoscope-315}/diffoscope/comparators/fontconfig.py

@@ -71,9 +71,7 @@ struct FcCache {{
     int             checksum = {checksum};  /* checksum of directory state */
     int64_t         checksum_nano = {checksum_nano};  /* checksum of directory state */
 }};
-""".format(
-        **kwargs
-    )
+""".format(**kwargs)
 
 
 def read_null_terminated_string(fileobj, offset=None):

{diffoscope-313 → diffoscope-315}/diffoscope/comparators/macho.py

@@ -33,7 +33,6 @@ from .utils.container import Container
 from .decompile import DecompilableContainer
 from .utils.command import Command, our_check_output
 
-
 logger = logging.getLogger(__name__)
 
 

{diffoscope-313 → diffoscope-315}/diffoscope/comparators/pgp.py

@@ -96,7 +96,7 @@ class PGPContainer(Archive):
 
 class PgpFile(File):
     DESCRIPTION = "PGP signed/encrypted messages"
-    FILE_TYPE_RE = re.compile(r"^PGP message\b")
+    FILE_TYPE_RE = re.compile(r"^(PGP message|PGP compressed data)\b")
     CONTAINER_CLASSES = [PGPContainer]
     FALLBACK_FILE_EXTENSION_SUFFIX = {".pgp", ".asc", ".pub", ".sec", ".gpg"}
 

{diffoscope-313 → diffoscope-315}/diffoscope/comparators/rdata.py

@@ -29,7 +29,6 @@ import os.path
 import logging
 import binascii
 
-
 RDS_HEADERS = {
     binascii.a2b_hex("580a000000020003"),
     binascii.a2b_hex("580a000000030003"),

{diffoscope-313 → diffoscope-315}/diffoscope/comparators/utils/compare.py

@@ -36,7 +36,6 @@ from ..missing_file import MissingFile
 from .command import Command
 from .specialize import specialize
 
-
 logger = logging.getLogger(__name__)
 
 

{diffoscope-313 → diffoscope-315}/diffoscope/comparators/vmlinuz.py

@@ -25,7 +25,6 @@ from diffoscope.difference import Difference
 from .utils.file import File
 from .utils.command import Command
 
-
 logger = logging.getLogger(__name__)
 
 

{diffoscope-313 → diffoscope-315}/diffoscope/config.py

@@ -21,7 +21,6 @@
 import logging
 import time
 
-
 logger = logging.getLogger(__name__)
 
 

{diffoscope-313 → diffoscope-315}/diffoscope/presenters/icon.py

@@ -17,6 +17,4 @@ paWY611wmyWyUzxZDbIWTvEV1Ildn5agfBumoUMTtoisFvhebAAHZWxX0ChwTuScvHdVeVykToys
 MyJ7ittwbmj31J+6IrRDp5XTfBt1WJ+WYnZdMB0F3xlUgD5uDVj2Sa+a4SrzH+FeyHHmw17V112w
 aBOZgP4WczkLZsILar1fpIliMU4XZoK/poE0XHl+N8v6QcGAUbVymnDIZVnzrTXqGzmnhKLxZX/n
 iyiDjIJgwg4Se1GR/Y8idGPysh6fr0i1i/AHMWHgrwUJgNAAAAAASUVORK5CYII=
-""".replace(
-    "\n", ""
-)
+""".replace("\n", "")

{diffoscope-313 → diffoscope-315}/diffoscope/progress.py

@@ -26,7 +26,6 @@ import logging
 from .logging import line_eraser
 from .tools import python_module_missing
 
-
 logger = logging.getLogger(__name__)
 
 try:

{diffoscope-313 → diffoscope-315/diffoscope.egg-info}/PKG-INFO

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

{diffoscope-313 → diffoscope-315}/setup.py

@@ -6,7 +6,6 @@ import sys
 
 from setuptools import setup, find_packages
 
-
 if sys.version_info < (3, 7):
     print("diffoscope requires at least python 3.7", file=sys.stderr)
     sys.exit(1)

{diffoscope-313 → diffoscope-315}/tests/comparators/test_archive.py

@@ -20,7 +20,6 @@ import pytest
 
 from ..utils.data import load_fixture
 
-
 archive1 = load_fixture("archive1.tar")
 archive2 = load_fixture("archive2.tar")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_arsc.py

@@ -26,7 +26,6 @@ from diffoscope.comparators.missing_file import MissingFile
 from ..utils.data import load_fixture, get_data
 from ..utils.tools import skip_unless_tools_exist
 
-
 arsc1 = load_fixture("resources1.arsc")
 arsc2 = load_fixture("resources2.arsc")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_asar.py

@@ -27,7 +27,6 @@ from ..utils.data import load_fixture, get_data
 from ..utils.tools import skip_unless_tools_exist
 from ..utils.nonexisting import assert_non_existing
 
-
 asar1 = load_fixture("test1.asar")
 asar2 = load_fixture("test2.asar")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_binary.py

@@ -39,7 +39,6 @@ from ..utils.tools import (
     file_version_is_lt,
 )
 
-
 TEST_FILE1_PATH = data("binary1")
 TEST_FILE2_PATH = data("binary2")
 TEST_ASCII_PATH = data("text_ascii1")

{diffoscope-313 → diffoscope-315}/tests/comparators/test_bzip2.py

@@ -28,7 +28,6 @@ from ..utils.data import load_fixture, get_data
 from ..utils.tools import skip_unless_tools_exist
 from ..utils.nonexisting import assert_non_existing
 
-
 bzip1 = load_fixture("test1.bz2")
 bzip2 = load_fixture("test2.bz2")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_cbfs.py

@@ -30,7 +30,6 @@ from ..utils.data import data, get_data
 from ..utils.tools import skip_unless_tools_exist
 from ..utils.nonexisting import assert_non_existing
 
-
 TEST_FILE1_PATH = data("text_ascii1")
 TEST_FILE2_PATH = data("text_ascii2")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_deb.py

@@ -33,7 +33,6 @@ from ..utils.tools import (
 )
 from ..utils.data import load_fixture, get_data
 
-
 deb1 = load_fixture("test1.deb")
 deb2 = load_fixture("test2.deb")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_device.py

@@ -26,7 +26,6 @@ from diffoscope.comparators.utils.specialize import specialize
 from ..utils.data import load_fixture, get_data, normalize_zeros
 from ..utils.tools import skip_unless_tools_exist
 
-
 text_ascii1 = load_fixture("text_ascii1")
 
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_dex.py

@@ -33,7 +33,6 @@ from ..utils.tools import (
 
 from .test_java import javap_version
 
-
 dex1 = load_fixture("test1.dex")
 dex2 = load_fixture("test2.dex")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_directory.py

@@ -31,7 +31,6 @@ from diffoscope.config import Config
 
 from ..utils.data import data, get_data, assert_diff
 
-
 TEST_FILE1_PATH = data("text_ascii1")
 TEST_FILE2_PATH = data("text_ascii2")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_elf.py

@@ -41,7 +41,6 @@ from ..utils.tools import (
 )
 from .test_rlib import llvm_version
 
-
 obj1 = load_fixture("test1.o")
 obj2 = load_fixture("test2.o")
 ignore_readelf_errors1 = load_fixture("test1.debug")

{diffoscope-313 → diffoscope-315}/tests/comparators/test_epub.py

@@ -28,7 +28,6 @@ from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least
 
 from .test_zip import zipdetails_version
 
-
 epub1 = load_fixture("test1.epub")
 epub2 = load_fixture("test2.epub")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_fonts.py

@@ -26,7 +26,6 @@ from diffoscope.comparators.missing_file import MissingFile
 from ..utils.data import load_fixture, assert_diff
 from ..utils.tools import skip_unless_tools_exist
 
-
 ttf1 = load_fixture("Samyak-Malayalam1.ttf")
 ttf2 = load_fixture("Samyak-Malayalam2.ttf")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_gettext.py

@@ -26,7 +26,6 @@ from diffoscope.comparators.gettext import MoFile
 from ..utils.data import data, load_fixture, assert_diff
 from ..utils.tools import skip_unless_tools_exist
 
-
 mo1 = load_fixture("test1.mo")
 mo2 = load_fixture("test2.mo")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_git.py

@@ -23,7 +23,6 @@ from diffoscope.comparators.git import GitIndexFile
 
 from ..utils.data import assert_diff, load_fixture
 
-
 git1 = load_fixture("test1.git-index")
 git2 = load_fixture("test2.git-index")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_gzip.py

@@ -32,7 +32,6 @@ from diffoscope.comparators.utils.specialize import (
 from ..utils.data import load_fixture, get_data
 from ..utils.tools import skip_unless_file_version_is_at_least
 
-
 gzip1 = load_fixture("test1.gz")
 gzip2 = load_fixture("test2.gz")
 gzip3 = load_fixture("debian-bug-876316-control.tar.gz")

{diffoscope-313 → diffoscope-315}/tests/comparators/test_haskell.py

@@ -24,7 +24,6 @@ from diffoscope.comparators.haskell import HiFile
 from ..utils.data import get_data, load_fixture, assert_diff
 from ..utils.tools import skip_unless_tools_exist
 
-
 haskell1 = load_fixture("test1.hi")
 haskell2 = load_fixture("test2.hi")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_html.py

@@ -23,7 +23,6 @@ from diffoscope.comparators.html import HtmlFile
 from ..utils.data import assert_diff, load_fixture
 from ..utils.tools import skip_unless_tools_exist
 
-
 html1 = load_fixture("test1.html")
 html2 = load_fixture("test2.html")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_icc.py

@@ -28,7 +28,6 @@ from diffoscope.comparators.missing_file import MissingFile
 from ..utils.data import load_fixture, get_data, data
 from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least
 
-
 icc1 = load_fixture("test1.icc")
 icc2 = load_fixture("test2.icc")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_ico_image.py

@@ -28,7 +28,6 @@ from ..utils.tools import (
 )
 from .test_jpeg_image import imagemagick_version
 
-
 image1 = load_fixture("test1.ico")
 image2 = load_fixture("test2.ico")
 image1_meta = load_fixture("test1_meta.ico")

{diffoscope-313 → diffoscope-315}/tests/comparators/test_ipk.py

@@ -26,7 +26,6 @@ from diffoscope.comparators.missing_file import MissingFile
 from ..utils.data import load_fixture, get_data
 from ..utils.tools import skip_unless_file_version_is_at_least
 
-
 ipk1 = load_fixture("base-files_157-r45695_ar71xx.ipk")
 ipk2 = load_fixture("base-files_157-r45918_ar71xx.ipk")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_iso9660.py

@@ -27,7 +27,6 @@ from diffoscope.comparators.iso9660 import Iso9660File
 from ..utils.data import load_fixture, get_data
 from ..utils.tools import skip_unless_tools_exist
 
-
 iso1 = load_fixture("test1.iso")
 iso2 = load_fixture("test2.iso")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_java.py

@@ -31,7 +31,6 @@ from ..utils.tools import (
     skip_unless_tool_is_between,
 )
 
-
 class1 = load_fixture("Test1.class")
 class2 = load_fixture("Test2.class")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_javascript.py

@@ -26,7 +26,6 @@ from diffoscope.comparators.missing_file import MissingFile
 from ..utils.data import load_fixture, get_data
 from ..utils.tools import skip_unless_tools_exist
 
-
 javascript1 = load_fixture("test1.js")
 javascript2 = load_fixture("test2.js")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_jpeg_image.py

@@ -26,7 +26,6 @@ from diffoscope.comparators.missing_file import MissingFile
 from ..utils.data import load_fixture, assert_diff
 from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_between
 
-
 image1 = load_fixture("test1.jpg")
 image2 = load_fixture("test2.jpg")
 image1_meta = load_fixture("test1_meta.jpg")

{diffoscope-313 → diffoscope-315}/tests/comparators/test_json.py

@@ -23,7 +23,6 @@ from diffoscope.comparators.json import JSONFile
 from ..utils.data import load_fixture, assert_diff
 from ..utils.nonexisting import assert_non_existing
 
-
 json1 = load_fixture("test1.json")
 json2 = load_fixture("test2.json")
 json3a = load_fixture("order1a.json")

{diffoscope-313 → diffoscope-315}/tests/comparators/test_macho.py

@@ -29,7 +29,6 @@ from ..utils.data import load_fixture, assert_diff
 from ..utils.tools import skip_unless_tools_exist
 from .test_rlib import llvm_version
 
-
 obj1 = load_fixture("test1.macho")
 obj2 = load_fixture("test2.macho")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_mono.py

@@ -26,7 +26,6 @@ from diffoscope.comparators.missing_file import MissingFile
 from ..utils.data import load_fixture, get_data
 from ..utils.tools import skip_unless_tools_exist
 
-
 # these were generated with:
 
 # echo 'public class Test { static public void Main () {} }' > test.cs

{diffoscope-313 → diffoscope-315}/tests/comparators/test_openssh_pub_key.py

@@ -32,7 +32,6 @@ from ..utils.tools import (
     skip_unless_tool_is_at_most,
 )
 
-
 # Generated by: ssh-keygen -t dsa -C "Test1"
 opensshpubkey1 = load_fixture("test_openssh_pub_key1.pub")
 # Generated by: ssh-keygen -t rsa -b 4096 -C "Test2"

{diffoscope-313 → diffoscope-315}/tests/comparators/test_pdf.py

@@ -29,7 +29,6 @@ from ..utils.tools import (
 )
 from ..utils.nonexisting import assert_non_existing
 
-
 pdf1 = load_fixture("test1.pdf")
 pdf2 = load_fixture("test2.pdf")
 pdf3 = load_fixture("test3.pdf")

{diffoscope-313 → diffoscope-315}/tests/comparators/test_png.py

@@ -26,7 +26,6 @@ from ..utils.data import load_fixture, get_data
 from ..utils.tools import skip_unless_tools_exist
 from ..utils.nonexisting import assert_non_existing
 
-
 png1 = load_fixture("test1.png")
 png2 = load_fixture("test2.png")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_ppu.py

@@ -27,7 +27,6 @@ from ..utils.data import load_fixture, assert_diff
 from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least
 from ..utils.nonexisting import assert_non_existing
 
-
 # These test files were taken from two different builds of the Debian package
 # fp-units-castle-game-engine (version 5.1.1-2 on amd64) on the Debian
 # reproducible build infrastructure. The files were originally called

{diffoscope-313 → diffoscope-315}/tests/comparators/test_ps.py

@@ -26,7 +26,6 @@ from ..utils.data import load_fixture, get_data
 from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least
 from ..utils.nonexisting import assert_non_existing
 
-
 ps1 = load_fixture("test1.ps")
 ps2 = load_fixture("test2.ps")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_rdata.py

@@ -28,7 +28,6 @@ from diffoscope.comparators.rdata import RdbFile
 from ..utils.data import load_fixture, get_data, assert_diff
 from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least
 
-
 rdb1 = load_fixture("test1.rdb")
 rdb2 = load_fixture("test2.rdb")
 rdx1 = load_fixture("test1.rdx")

{diffoscope-313 → diffoscope-315}/tests/comparators/test_rlib.py

@@ -34,7 +34,6 @@ from ..utils.tools import (
 from ..utils.nonexisting import assert_non_existing
 from ..utils.versions import Version
 
-
 rlib1 = load_fixture("test1.rlib")
 rlib2 = load_fixture("test2.rlib")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_sockets.py

@@ -93,8 +93,8 @@ def expected_results(endpoints):
 
 
 def test_sockets(endpoints, expected_results, sampletext):
-    (names, objects) = zip(*endpoints)
-    (sock1, sock2, pipe1, pipe2) = objects
+    names, objects = zip(*endpoints)
+    sock1, sock2, pipe1, pipe2 = objects
     (
         sock_text_diff,
         pipe_text_diff,

{diffoscope-313 → diffoscope-315}/tests/comparators/test_sphinx.py

@@ -22,7 +22,6 @@ from diffoscope.comparators.sphinx import SphinxInventoryFile
 
 from ..utils.data import assert_diff, load_fixture
 
-
 inv1 = load_fixture("test1.inv")
 inv2 = load_fixture("test2.inv")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_sqlite.py

@@ -25,7 +25,6 @@ from ..utils.data import load_fixture, get_data
 from ..utils.tools import skip_unless_tools_exist
 from ..utils.nonexisting import assert_non_existing
 
-
 sqlite3db1 = load_fixture("test1.sqlite3")
 sqlite3db2 = load_fixture("test2.sqlite3")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_tar.py

@@ -26,7 +26,6 @@ from diffoscope.comparators.missing_file import MissingFile
 from ..utils.data import load_fixture, get_data
 from ..utils.nonexisting import assert_non_existing
 
-
 tar1 = load_fixture("test1.tar")
 tar2 = load_fixture("test2.tar")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_text.py

@@ -24,7 +24,6 @@ from diffoscope.comparators.utils.specialize import specialize
 from ..utils.data import data, load_fixture, assert_diff
 from ..utils.nonexisting import assert_non_existing
 
-
 ascii1 = load_fixture("text_ascii1")
 ascii2 = load_fixture("text_ascii2")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_utils.py

@@ -32,7 +32,6 @@ from ..utils.tools import (
     skip_unless_module_exists,
 )
 
-
 fuzzy_tar1 = load_fixture("fuzzy1.tar")
 fuzzy_tar2 = load_fixture("fuzzy2.tar")
 fuzzy_tar3 = load_fixture("fuzzy3.tar")

{diffoscope-313 → diffoscope-315}/tests/comparators/test_wasm.py

@@ -25,7 +25,6 @@ from ..utils.data import load_fixture, get_data
 from ..utils.tools import skip_unless_tools_exist
 from ..utils.nonexisting import assert_non_existing
 
-
 wasmmodule1 = load_fixture("hello1.wasm")
 wasmmodule2 = load_fixture("hello2.wasm")
 

{diffoscope-313 → diffoscope-315}/tests/comparators/test_zip.py

@@ -32,7 +32,6 @@ from ..utils.data import load_fixture, assert_diff
 from ..utils.tools import skip_unless_tools_exist, skip_unless_tool_is_at_least
 from ..utils.nonexisting import assert_non_existing
 
-
 zip1 = load_fixture("test1.zip")
 zip2 = load_fixture("test2.zip")
 zip3 = load_fixture("test3.zip")

{diffoscope-313 → diffoscope-315}/tests/test_progress.py

@@ -27,7 +27,6 @@ from diffoscope.progress import ProgressManager, StatusFD
 from .utils.tools import skip_unless_module_exists
 from .utils.versions import Version
 
-
 TEST_TAR1_PATH = os.path.join(os.path.dirname(__file__), "data", "test1.tar")
 TEST_TAR2_PATH = os.path.join(os.path.dirname(__file__), "data", "test2.tar")
 

{diffoscope-313 → diffoscope-315}/tests/test_source.py

@@ -34,7 +34,7 @@ def black_version():
     ]
 
 
-@skip_unless_tool_is_at_least("black", black_version, "25.1.0")
+@skip_unless_tool_is_at_least("black", black_version, "26.1.0")
 def test_code_is_black_clean():
     output = subprocess.check_output(
         ("black", "--diff", "."), stderr=subprocess.PIPE