patch-fixer 0.3.0__tar.gz → 0.3.1__tar.gz

{patch_fixer-0.3.0 → patch_fixer-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: patch-fixer
-Version: 0.3.0
+Version: 0.3.1
 Summary: Fixes erroneous git apply patches to the best of its ability.
 Maintainer-email: Alex Mueller <amueller474@gmail.com>
 License-Expression: Apache-2.0
@@ -22,6 +22,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: GitPython
 Provides-Extra: test
+Requires-Dist: hypothesis; extra == "test"
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: requests; extra == "test"
 Dynamic: license-file
@@ -71,7 +72,7 @@ pytest
 ```
 From version `0.3.0` onward (at least until version `1.0`), some test failures are expected
 in bugfix versions as I like to use test-driven development to build out new features. 
-Please only report test failures if the same test passed in the most recent `0.x.0` version.
+Please only report test failures if the same test existed and passed in the most recent `0.x.0` version.
 
 ## License
 

{patch_fixer-0.3.0 → patch_fixer-0.3.1}/README.md

@@ -43,7 +43,7 @@ pytest
 ```
 From version `0.3.0` onward (at least until version `1.0`), some test failures are expected
 in bugfix versions as I like to use test-driven development to build out new features. 
-Please only report test failures if the same test passed in the most recent `0.x.0` version.
+Please only report test failures if the same test existed and passed in the most recent `0.x.0` version.
 
 ## License
 

{patch_fixer-0.3.0 → patch_fixer-0.3.1}/patch_fixer/patch_fixer.py

@@ -25,9 +25,40 @@ class MissingHunkError(Exception):
     pass
 
 
+class BadCarriageReturn(ValueError):
+    pass
+
+
 def normalize_line(line):
-    # preserve whitespace, only normalize line endings
-    return line.rstrip("\r\n") + "\n"
+    """Normalize line endings while preserving whitespace."""
+    if not isinstance(line, str):
+        raise TypeError(f"Cannot normalize non-string object {line}")
+
+    # edge case: empty string
+    if line == "":
+        return "\n"
+
+    # special malformed ending: ...\n\r
+    if line.endswith("\n\r"):
+        raise BadCarriageReturn(f"carriage return after line feed: {line}")
+
+    # handle CRLF and simple CR/LF endings
+    if line.endswith("\r\n"):
+        core = line[:-2]
+    elif line.endswith("\r"):
+        core = line[:-1]
+    elif line.endswith("\n"):
+        core = line[:-1]
+    else:
+        core = line
+
+    # check for interior CR/LF (anything before the final terminator)
+    if "\n" in core:
+        raise ValueError(f"line feed in middle of line: {line}")
+    if "\r" in core:
+        raise BadCarriageReturn(f"carriage return in middle of line: {line}")
+
+    return core + "\n"
 
 
 def find_hunk_start(context_lines, original_lines):

{patch_fixer-0.3.0 → patch_fixer-0.3.1}/patch_fixer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: patch-fixer
-Version: 0.3.0
+Version: 0.3.1
 Summary: Fixes erroneous git apply patches to the best of its ability.
 Maintainer-email: Alex Mueller <amueller474@gmail.com>
 License-Expression: Apache-2.0
@@ -22,6 +22,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: GitPython
 Provides-Extra: test
+Requires-Dist: hypothesis; extra == "test"
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: requests; extra == "test"
 Dynamic: license-file
@@ -71,7 +72,7 @@ pytest
 ```
 From version `0.3.0` onward (at least until version `1.0`), some test failures are expected
 in bugfix versions as I like to use test-driven development to build out new features. 
-Please only report test failures if the same test passed in the most recent `0.x.0` version.
+Please only report test failures if the same test existed and passed in the most recent `0.x.0` version.
 
 ## License
 

{patch_fixer-0.3.0 → patch_fixer-0.3.1}/patch_fixer.egg-info/SOURCES.txt

@@ -8,4 +8,5 @@ patch_fixer.egg-info/SOURCES.txt
 patch_fixer.egg-info/dependency_links.txt
 patch_fixer.egg-info/requires.txt
 patch_fixer.egg-info/top_level.txt
+tests/test_norm.py
 tests/test_repos.py

{patch_fixer-0.3.0 → patch_fixer-0.3.1}/patch_fixer.egg-info/requires.txt

@@ -1,5 +1,6 @@
 GitPython
 
 [test]
+hypothesis
 pytest
 requests

{patch_fixer-0.3.0 → patch_fixer-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "patch-fixer"
-version = "0.3.0"
+version = "0.3.1"
 description = "Fixes erroneous git apply patches to the best of its ability."
 maintainers = [
     {name = "Alex Mueller", email="amueller474@gmail.com"},
@@ -34,6 +34,7 @@ license-files = [
 
 [project.optional-dependencies]
 test = [
+    "hypothesis",
     "pytest",
     "requests"
 ]

patch_fixer-0.3.1/tests/test_norm.py

@@ -0,0 +1,87 @@
+import pytest
+from hypothesis import given, strategies as st
+
+from patch_fixer.patch_fixer import normalize_line, BadCarriageReturn
+
+# --- Good cases --------------------------------------------------
+
+@pytest.mark.parametrize("line, expected", [
+    ("", "\n"),                # empty string -> newline
+    ("foo", "foo\n"),          # no terminator
+    ("foo\r", "foo\n"),        # CR terminator normalized
+    ("foo\n", "foo\n"),        # LF terminator unchanged
+    ("foo\r\n", "foo\n"),      # CRLF normalized
+])
+def test_normalize_good(line, expected):
+    assert normalize_line(line) == expected
+
+
+# --- Type errors -------------------------------------------------
+
+@pytest.mark.parametrize("bad", [
+    123,
+    4.56,
+    None,
+    True,
+    ["list"],
+    {"set"},
+    {"dict": "val"},
+    ("tuple",),
+])
+def test_normalize_type_error(bad):
+    with pytest.raises(TypeError):
+        normalize_line(bad)
+
+
+# --- Bad endings -------------------------------------------------
+
+@pytest.mark.parametrize("line", [
+    "foo\n\r",   # LF then CR
+    "foo\rx",    # CR not followed by LF at end
+])
+def test_normalize_bad_endings(line):
+    with pytest.raises(BadCarriageReturn):
+        normalize_line(line)
+
+
+# --- Interior CR/LF ----------------------------------------------
+
+def test_interior_lf_raises():
+    line = "bad\nline\n"
+    with pytest.raises(ValueError):
+        normalize_line(line)
+
+def test_interior_cr_raises():
+    line = "bad\rcarriage\n"
+    with pytest.raises(BadCarriageReturn):
+        normalize_line(line)
+
+# --- Hypothesis testing ------------------------------------------
+
+# generate arbitrary strings including \r and \n
+line_strategy = st.text(alphabet=st.characters(), min_size=0, max_size=100)
+
+@given(line=line_strategy)
+def test_normalize_line_hypothesis(line):
+    # we want to see that normalize_line either:
+    # 1. returns a string ending with exactly one "\n", or
+    # 2. raises ValueError for interior LF, or
+    # 3. raises BadCarriageReturn for interior CR or malformed endings
+    try:
+        result = normalize_line(line)
+    except BadCarriageReturn:
+        # must have an interior CR somewhere, or malformed ending
+        cr_condition = (("\r" in line[:-2])
+                        or (line.endswith("\r") and not line.endswith("\r\n"))
+                        or line.endswith("\n\r"))
+        assert cr_condition, f"BadCarriageReturn raised unexpectedly for line: {line!r}"
+    except ValueError:
+        # must have an interior LF somewhere
+        assert "\n" in line[:-1], f"ValueError raised unexpectedly for line: {line!r}"
+    else:
+        # function returned normally
+        assert result.endswith("\n"), f"Returned line does not end with \\n: {result!r}"
+
+        core = result[:-1]
+        assert "\n" not in core
+        assert "\r" not in core

{patch_fixer-0.3.0 → patch_fixer-0.3.1}/tests/test_repos.py

@@ -27,11 +27,20 @@ import pytest
 from patch_fixer import fix_patch
 
 REPOS = {
+    ("apache", "airflow"): ("26f6e54","2136f56"),   # big repo
     ("asottile", "astpretty"): ("5b68c7e", "5a8296f"),
+    ("astral-sh", "ruff"): ("7fee877", "11dae2c"),
+    ("gabrielecirulli", "2048"): ("878098f", "478b6ec"),    # adds binary files
+    ("mrdoob", "three.js"): ("5f3a718", "b97f111"),         # replaces images
+    ("myriadrf", "LimeSDR-Mini"): ("0bb75e7", "fb012c8"),   # gigantic diffs
     ("numpy", "numpy"): ("dca33b3", "5f82966"),
     ("pallets", "click"): ("93c6966", "e11a1ef"),
+    ("psf", "black"): ("8d9d18c", "903bef5"),   # whole year's worth of changes
+    ("PyCQA", "flake8"): ("8bdec0b", "d45bdc0"),    # two years of changes
     ("scipy", "scipy"): ("c2220c0", "4ca6dd9"),
+    ("tox-dev", "tox"): ("fb3fe66", "01442da"),     # four years
     ("yaml", "pyyaml"): ("48838a3", "a2d19c0"),
+    ("zertovitch", "hac"): ("c563d18", "17207ee")   # renamed binary files
 }
 
 CACHE_DIR = Path.home() / ".patch-testing"