diff-cover 9.2.3__tar.gz → 9.2.4__tar.gz

{diff_cover-9.2.3 → diff_cover-9.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: diff_cover
-Version: 9.2.3
+Version: 9.2.4
 Summary: Run coverage and linting reports on diffs
 License: Apache-2.0
 Author: See Contributors

{diff_cover-9.2.3 → diff_cover-9.2.4}/diff_cover/git_diff.py

@@ -5,6 +5,7 @@ Wrapper for `git diff` command.
 from textwrap import dedent
 
 from diff_cover.command_runner import CommandError, execute
+from diff_cover.util import to_unescaped_filename
 
 
 class GitDiffError(Exception):
@@ -109,7 +110,7 @@ class GitDiffTool:
         output = execute(["git", "ls-files", "--exclude-standard", "--others"])[0]
         if not output:
             return []
-        return [line for line in output.splitlines() if line]
+        return [to_unescaped_filename(line) for line in output.splitlines() if line]
 
 
 class GitDiffFileTool(GitDiffTool):

diff_cover-9.2.4/diff_cover/util.py

@@ -0,0 +1,56 @@
+import os.path
+import posixpath
+
+
+def to_unix_path(path):
+    """
+    Tries to ensure tha the path is a normalized unix path.
+    This seems to be the solution cobertura used....
+    https://github.com/cobertura/cobertura/blob/642a46eb17e14f51272c6962e64e56e0960918af/cobertura/src/main/java/net/sourceforge/cobertura/instrument/ClassPattern.java#L84
+
+    I know of at least one case where this will fail (\\) is allowed in unix paths.
+    But I am taking the bet that this is not common. We deal with source code.
+
+    :param path: string of the path to convert
+    :return: the unix version of that path
+    """
+    return posixpath.normpath(os.path.normcase(path).replace("\\", "/"))
+
+
+def to_unescaped_filename(filename: str) -> str:
+    """Try to unescape the given filename.
+
+    Some filenames given by git might be escaped with C-style escape sequences
+    and surrounded by double quotes.
+    """
+    if not (filename.startswith('"') and filename.endswith('"')):
+        return filename
+
+    # Remove surrounding quotes
+    unquoted = filename[1:-1]
+
+    # Handle C-style escape sequences
+    result = []
+    i = 0
+    while i < len(unquoted):
+        if unquoted[i] == "\\" and i + 1 < len(unquoted):
+            # Handle common C escape sequences
+            next_char = unquoted[i + 1]
+            result.append(
+                {
+                    "\\": "\\",
+                    '"': '"',
+                    "a": "a",
+                    "n": "\n",
+                    "t": "\t",
+                    "r": "\r",
+                    "b": "\b",
+                    "f": "\f",
+                }.get(next_char, next_char)
+            )
+            i += 2
+        else:
+            result.append(unquoted[i])
+            i += 1
+
+    return "".join(result)

{diff_cover-9.2.3 → diff_cover-9.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "diff_cover"
-version = "9.2.3"
+version = "9.2.4"
 description = "Run coverage and linting reports on diffs"
 authors = ["See Contributors"]
 homepage = "https://github.com/Bachmann1234/diff-cover"
@@ -59,7 +59,7 @@ pylint = "^3.3.4"
 pylint-pytest = "^1.1.8"
 pydocstyle = "^6.1.1"
 black = "^25.1.0"
-isort = "^5.13.2"
+isort = "^6.0.1"
 doc8 = "1.1.2"
 
 [tool.poetry.extras]

diff_cover-9.2.4/tests/test_util.py

@@ -0,0 +1,23 @@
+import sys
+
+from diff_cover import util
+
+
+def test_to_unix_path():
+    """
+    Ensure the _to_unix_path static function handles paths properly.
+    """
+    assert util.to_unix_path("foo/bar") == "foo/bar"
+    assert util.to_unix_path("foo\\bar") == "foo/bar"
+    if sys.platform.startswith("win"):
+        assert util.to_unix_path("FOO\\bar") == "foo/bar"
+
+
+def test_to_unescaped_filename():
+    """Test the to_unescaped_filename function."""
+    assert util.to_unescaped_filename('"\\\\\\\\"') == "\\\\"
+    assert util.to_unescaped_filename('"\\\\"') == "\\"
+    assert util.to_unescaped_filename('"\\"\\\\"') == '"\\'
+    assert util.to_unescaped_filename('"\\""') == '"'
+    assert util.to_unescaped_filename("some_file.py") == "some_file.py"
+    assert util.to_unescaped_filename("#$%") == "#$%"

diff_cover-9.2.3/diff_cover/util.py

@@ -1,17 +0,0 @@
-import os.path
-import posixpath
-
-
-def to_unix_path(path):
-    """
-    Tries to ensure tha the path is a normalized unix path.
-    This seems to be the solution cobertura used....
-    https://github.com/cobertura/cobertura/blob/642a46eb17e14f51272c6962e64e56e0960918af/cobertura/src/main/java/net/sourceforge/cobertura/instrument/ClassPattern.java#L84
-
-    I know of at least one case where this will fail (\\) is allowed in unix paths.
-    But I am taking the bet that this is not common. We deal with source code.
-
-    :param path: string of the path to convert
-    :return: the unix version of that path
-    """
-    return posixpath.normpath(os.path.normcase(path).replace("\\", "/"))

diff_cover-9.2.3/tests/test_util.py

@@ -1,13 +0,0 @@
-import sys
-
-from diff_cover import util
-
-
-def test_to_unix_path():
-    """
-    Ensure the _to_unix_path static function handles paths properly.
-    """
-    assert util.to_unix_path("foo/bar") == "foo/bar"
-    assert util.to_unix_path("foo\\bar") == "foo/bar"
-    if sys.platform.startswith("win"):
-        assert util.to_unix_path("FOO\\bar") == "foo/bar"