diffoscope 285__tar.gz → 286__tar.gz

{diffoscope-285/diffoscope.egg-info → diffoscope-286}/PKG-INFO

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

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

{diffoscope-285 → diffoscope-286}/diffoscope/comparators/iso9660.py

@@ -24,27 +24,10 @@ from diffoscope.tools import tool_required
 from diffoscope.difference import Difference
 
 from .utils.file import File
-from .utils.command import Command, our_check_output
+from .utils.command import Command
 from .utils.libarchive import LibarchiveContainerWithFilelist
 
 
-@tool_required("isoinfo")
-def get_iso9660_names(path):
-    return (
-        our_check_output(
-            (
-                "isoinfo",
-                "-R",  # Always use RockRidge for names
-                "-f",
-                "-i",
-                path,
-            ),
-        )
-        .strip()
-        .split("\n")
-    )
-
-
 class ISO9660PVD(Command):
     @tool_required("isoinfo")
     def cmdline(self):

{diffoscope-285 → diffoscope-286}/diffoscope/comparators/utils/compare.py

@@ -25,7 +25,7 @@ import subprocess
 
 from diffoscope.tools import tool_required
 from diffoscope.exc import RequiredToolNotFound
-from diffoscope.utils import exit_if_paths_do_not_exist
+from diffoscope.utils import exit_if_paths_inaccessible
 from diffoscope.config import Config
 from diffoscope.excludes import any_excluded
 from diffoscope.profiling import profile
@@ -55,7 +55,7 @@ def compare_root_paths(path1, path2):
     )
 
     if not Config().new_file:
-        exit_if_paths_do_not_exist(path1, path2)
+        exit_if_paths_inaccessible(path1, path2)
     if any_excluded(path1, path2):
         return None
 
@@ -63,9 +63,14 @@ def compare_root_paths(path1, path2):
         return compare_directories(path1, path2)
 
     container1 = FilesystemDirectory(os.path.dirname(path1)).as_container
-    file1 = specialize(FilesystemFile(path1, container=container1))
+    file1 = FilesystemFile(path1, container=container1)
     container2 = FilesystemDirectory(os.path.dirname(path2)).as_container
-    file2 = specialize(FilesystemFile(path2, container=container2))
+    file2 = FilesystemFile(path2, container=container2)
+
+    with profile("has_same_content_as", file1):
+        if file1.has_same_content_as(file2):
+            return None
+
     difference = compare_files(file1, file2)
 
     if Config().exclude_directory_metadata in ("no", "recursive"):
@@ -110,12 +115,11 @@ def compare_files(file1, file2, source=None, diff_content_only=False):
         specialize(file1)
         specialize(file2)
 
-    force_details = Config().force_details
     with profile("has_same_content_as", file1):
         has_same_content = file1.has_same_content_as(file2)
 
     if has_same_content:
-        if not force_details:
+        if not Config().force_details:
             logger.debug(
                 "has_same_content_as returned True; skipping further comparisons"
             )

{diffoscope-285 → diffoscope-286}/diffoscope/comparators/utils/container.py

@@ -198,9 +198,13 @@ class Container(metaclass=abc.ABCMeta):
                 difference.add_comment(msg)
                 return difference
 
-            difference = compare_files(
-                file1, file2, source=None, diff_content_only=no_recurse
-            )
+            try:
+                difference = compare_files(
+                    file1, file2, source=None, diff_content_only=no_recurse
+                )
+            except PermissionError as exc:
+                logger.warning(f"Skipping {exc.filename} ({exc.strerror})")
+                return
 
             if isinstance(file1, AbstractMissingType) or isinstance(
                 file2, AbstractMissingType

{diffoscope-285 → diffoscope-286}/diffoscope/comparators/zip.py

@@ -54,7 +54,7 @@ class Zipinfo(Command):
 
         # Strip paths from errors and warnings
         # eg: "warning [/full/path]: 472 extra bytes at beginning or within zipfile"
-        m = self.re_strip_path.match(line.decode("utf-8"))
+        m = self.re_strip_path.match(line.decode("utf-8", "surrogateescape"))
         if m is not None:
             return "{}: {}\n".format(m.group(1), m.group(2)).encode("utf-8")
 

{diffoscope-285 → diffoscope-286}/diffoscope/difference.py

@@ -403,15 +403,16 @@ class Difference:
         self._visuals.extend(visuals)
         self._size_cache = None
 
-    def has_ordering_differences_only(self):
+    def check_for_ordering_differences(self):
         """
         Check if difference is only in line ordering.
         """
 
         if not self.unified_diff:
-            return False
+            return
 
-        diff_lines = self.unified_diff.splitlines()
+        # Split the diff, but retain the original line endings
+        diff_lines = self.unified_diff.splitlines(True)
 
         added_lines = [line[1:] for line in diff_lines if line.startswith("+")]
         removed_lines = [
@@ -420,16 +421,24 @@ class Difference:
 
         # Faster check: does number of lines match?
         if len(added_lines) != len(removed_lines):
-            return False
+            return
 
-        if added_lines == removed_lines:
-            return True
+        if added_lines == removed_lines or sorted(added_lines) == sorted(
+            removed_lines
+        ):
+            self.add_comment("Ordering differences only")
+            return
 
-        return sorted(added_lines) == sorted(removed_lines)
+        # Now strip off any trailing newlines, thus effectively normalising
+        # "\r\n" and "\n"...
+        added_lines = [x.rstrip("\r\n") for x in added_lines]
+        removed_lines = [x.rstrip("\r\n") for x in removed_lines]
 
-    def check_for_ordering_differences(self):
-        if self.has_ordering_differences_only():
-            self.add_comment("Ordering differences only")
+        # ... and re-run the same checks.
+        if added_lines == removed_lines or sorted(added_lines) == sorted(
+            removed_lines
+        ):
+            self.add_comment("Line-ending differences only")
 
 
 class VisualDifference:

{diffoscope-285 → diffoscope-286}/diffoscope/readers/__init__.py

@@ -19,13 +19,13 @@
 
 import codecs
 
-from diffoscope.utils import exit_if_paths_do_not_exist
+from diffoscope.utils import exit_if_paths_inaccessible
 
 from .json import JSONReaderV1
 
 
 def load_diff_from_path(path):
-    exit_if_paths_do_not_exist(path)
+    exit_if_paths_inaccessible(path)
     with open(path, "rb") as fp:
         return load_diff(codecs.getreader("utf-8")(fp), path)
 

{diffoscope-285 → diffoscope-286}/diffoscope/utils.py

@@ -58,16 +58,29 @@ def format_bytes(size, decimal_places=2):
     return f"{size:.{decimal_places}f} {unit}"
 
 
-def exit_if_paths_do_not_exist(*paths):
+def exit_if_paths_inaccessible(*paths):
+    """
+    Exit if the specified *paths are inaccessible, either by:
+
+        a) simply being missing
+        b) being a dangling symbolic links
+        c) being inaccessible (directly or via a symbolic link
+    """
+
     flag = False
     for path in paths:
-        if os.path.lexists(path):
-            continue
-        flag = True
-        print(
-            f"{sys.argv[0]}: {path}: No such file or directory",
-            file=sys.stderr,
-        )
+        if not os.path.lexists(path):
+            flag = True
+            print(
+                f"{sys.argv[0]}: {path}: No such file or directory",
+                file=sys.stderr,
+            )
+        elif not os.access(path, os.R_OK):
+            flag = True
+            print(
+                f"{sys.argv[0]}: {path}: Permission denied",
+                file=sys.stderr,
+            )
 
     if flag:
         sys.exit(2)

{diffoscope-285 → diffoscope-286/diffoscope.egg-info}/PKG-INFO

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

{diffoscope-285 → diffoscope-286}/diffoscope.egg-info/SOURCES.txt

@@ -605,6 +605,9 @@ tests/data/test_xml_ordering_differences_diff
 tests/data/text_ascii1
 tests/data/text_ascii2
 tests/data/text_ascii_expected_diff
+tests/data/text_endings1
+tests/data/text_endings2
+tests/data/text_endings_expected_diff
 tests/data/text_iso8859
 tests/data/text_iso8859_expected_diff
 tests/data/text_order1

{diffoscope-285 → diffoscope-286}/tests/comparators/test_text.py

@@ -23,7 +23,7 @@ from diffoscope.comparators.binary import FilesystemFile
 from diffoscope.comparators.text import TextFile
 from diffoscope.comparators.utils.specialize import specialize
 
-from ..utils.data import data, load_fixture, get_data
+from ..utils.data import data, load_fixture, assert_diff
 from ..utils.nonexisting import assert_non_existing
 
 
@@ -39,8 +39,7 @@ def test_no_differences(ascii1):
 def test_difference_in_ascii(ascii1, ascii2):
     difference = ascii1.compare(ascii2)
     assert difference is not None
-    expected_diff = get_data("text_ascii_expected_diff")
-    assert difference.unified_diff == expected_diff
+    assert_diff(difference, "text_ascii_expected_diff")
     assert not difference.comments
     assert len(difference.details) == 0
 
@@ -90,12 +89,20 @@ def test_compare_non_existing(monkeypatch, ascii1):
 
 text_order1 = load_fixture("text_order1")
 text_order2 = load_fixture("text_order2")
+text_endings1 = load_fixture("text_endings1")
+text_endings2 = load_fixture("text_endings2")
 
 
 def test_ordering_differences(text_order1, text_order2):
     difference = text_order1.compare(text_order2)
     assert difference.comments == ["Ordering differences only"]
-    assert difference.unified_diff == get_data("text_order_expected_diff")
+    assert_diff(difference, "text_order_expected_diff")
+
+
+def test_ending_differences(text_endings1, text_endings2):
+    difference = text_endings1.compare(text_endings2)
+    assert difference.comments == ["Line-ending differences only"]
+    assert_diff(difference, "text_endings_expected_diff")
 
 
 def test_text_fallback(tmp_path):

diffoscope-286/tests/data/text_endings1

@@ -0,0 +1,3 @@
+artifactId=logback-core
+groupId=ch.qos.logback
+version=1.2.13

diffoscope-286/tests/data/text_endings2

@@ -0,0 +1,3 @@
+artifactId=logback-core
+groupId=ch.qos.logback
+version=1.2.13

diffoscope-286/tests/data/text_endings_expected_diff

@@ -0,0 +1,7 @@
+@@ -1,3 +1,3 @@
+-artifactId=logback-core
+-groupId=ch.qos.logback
+-version=1.2.13
++artifactId=logback-core
++groupId=ch.qos.logback
++version=1.2.13

{diffoscope-285 → diffoscope-286}/tests/utils/data.py

@@ -52,7 +52,7 @@ def data(filename):
 
 
 def get_data(filename):
-    with open(data(filename), encoding="utf-8") as f:
+    with open(data(filename), newline="", encoding="utf-8") as f:
         return f.read()