patchy 2.9.0__tar.gz → 3.0.0__tar.gz

{patchy-2.9.0/src/patchy.egg-info → patchy-3.0.0}/PKG-INFO

@@ -1,27 +1,30 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: patchy
-Version: 2.9.0
+Version: 3.0.0
 Summary: Patch the inner source of python functions at runtime.
-Author-email: Adam Johnson <me@adamj.eu>
-Project-URL: Changelog, https://github.com/adamchainz/patchy/blob/main/CHANGELOG.rst
-Project-URL: Funding, https://adamj.eu/books/
-Project-URL: Repository, https://github.com/adamchainz/patchy
 Keywords: patchy
+Author: Adam Johnson
+Author-email: Adam Johnson <me@adamj.eu>
+License-Expression: MIT
+License-File: LICENSE
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Typing :: Typed
-Requires-Python: >=3.9
+Requires-Dist: unipatch
+Requires-Python: >=3.10
+Project-URL: Changelog, https://github.com/adamchainz/patchy/blob/main/CHANGELOG.rst
+Project-URL: Funding, https://adamj.eu/books/
+Project-URL: Repository, https://github.com/adamchainz/patchy
 Description-Content-Type: text/x-rst
-License-File: LICENSE
 
 ======
 Patchy
@@ -90,7 +93,7 @@ Use **pip**:
 
     python -m pip install patchy
 
-Python 3.9 to 3.13 supported.
+Python 3.10 to 3.15 supported.
 
 Why?
 ====
@@ -105,7 +108,7 @@ I found this with some small but important patches to Django for a project.
 Since it takes a lot of energy to maintain a fork, writing monkey patches was
 the chosen quick solution, but then writing actual patches would be better.
 
-The patches are applied with the standard ``patch`` commandline utility.
+The patches are applied in-memory by `unipatch <https://pypi.org/project/unipatch/>`__, a pure-Python implementation of unified diff patching, compatible with the behaviour of the GNU ``patch`` commandline utility.
 
 
 Why not?
@@ -113,8 +116,6 @@ Why not?
 
 There are of course a lot of reasons against:
 
-* It’s (relatively) slow (since it writes the source to disk and calls the
-  ``patch`` command)
 * If you have a patch file, why not just fork the library and apply it?
 * At least with monkey-patching you know what end up with, rather than having
   the changes being done at runtime to source that may have changed.
@@ -126,16 +127,10 @@ solution.
 How?
 ====
 
-The standard library function ``inspect.getsource()`` is used to retrieve the
-source code of the function, the patch is applied with the commandline utility
-``patch``, the code is recompiled, and the function’s code object is replaced
-the new one. Because nothing tends to poke around at code objects apart from
-dodgy hacks like this, you don’t need to worry about chasing any references
-that may exist to the function, unlike ``mock.patch``.
+The standard library function ``inspect.getsource()`` is used to retrieve the source code of the function, the patch is applied in-memory with `unipatch <https://pypi.org/project/unipatch/>`__, the code is recompiled, and the function’s code object is replaced the new one.
+Because nothing tends to poke around at code objects apart from dodgy hacks like this, you don’t need to worry about chasing any references that may exist to the function, unlike ``mock.patch``.
 
-A little special treatment is given to ``instancemethod``, ``classmethod``, and
-``staticmethod`` objects to make sure the underlying function is what gets
-patched and that you don't have to worry about the details.
+A little special treatment is given to ``instancemethod``, ``classmethod``, and ``staticmethod`` objects to make sure the underlying function is what gets patched and that you don't have to worry about the details.
 
 
 API

{patchy-2.9.0 → patchy-3.0.0}/README.rst

@@ -65,7 +65,7 @@ Use **pip**:
 
     python -m pip install patchy
 
-Python 3.9 to 3.13 supported.
+Python 3.10 to 3.15 supported.
 
 Why?
 ====
@@ -80,7 +80,7 @@ I found this with some small but important patches to Django for a project.
 Since it takes a lot of energy to maintain a fork, writing monkey patches was
 the chosen quick solution, but then writing actual patches would be better.
 
-The patches are applied with the standard ``patch`` commandline utility.
+The patches are applied in-memory by `unipatch <https://pypi.org/project/unipatch/>`__, a pure-Python implementation of unified diff patching, compatible with the behaviour of the GNU ``patch`` commandline utility.
 
 
 Why not?
@@ -88,8 +88,6 @@ Why not?
 
 There are of course a lot of reasons against:
 
-* It’s (relatively) slow (since it writes the source to disk and calls the
-  ``patch`` command)
 * If you have a patch file, why not just fork the library and apply it?
 * At least with monkey-patching you know what end up with, rather than having
   the changes being done at runtime to source that may have changed.
@@ -101,16 +99,10 @@ solution.
 How?
 ====
 
-The standard library function ``inspect.getsource()`` is used to retrieve the
-source code of the function, the patch is applied with the commandline utility
-``patch``, the code is recompiled, and the function’s code object is replaced
-the new one. Because nothing tends to poke around at code objects apart from
-dodgy hacks like this, you don’t need to worry about chasing any references
-that may exist to the function, unlike ``mock.patch``.
+The standard library function ``inspect.getsource()`` is used to retrieve the source code of the function, the patch is applied in-memory with `unipatch <https://pypi.org/project/unipatch/>`__, the code is recompiled, and the function’s code object is replaced the new one.
+Because nothing tends to poke around at code objects apart from dodgy hacks like this, you don’t need to worry about chasing any references that may exist to the function, unlike ``mock.patch``.
 
-A little special treatment is given to ``instancemethod``, ``classmethod``, and
-``staticmethod`` objects to make sure the underlying function is what gets
-patched and that you don't have to worry about the details.
+A little special treatment is given to ``instancemethod``, ``classmethod``, and ``staticmethod`` objects to make sure the underlying function is what gets patched and that you don't have to worry about the details.
 
 
 API

patchy-3.0.0/pyproject.toml

@@ -0,0 +1,112 @@
+[build-system]
+build-backend = "uv_build"
+requires = ["uv-build>=0.12.1,<0.13"]
+
+[project]
+name = "patchy"
+version = "3.0.0"
+description = "Patch the inner source of python functions at runtime."
+readme = "README.rst"
+keywords = ["patchy"]
+license = "MIT"
+license-files = ["LICENSE"]
+requires-python = ">=3.10"
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "Natural Language :: English",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Programming Language :: Python :: 3.15",
+    "Typing :: Typed",
+]
+dependencies = ["unipatch"]
+
+[[project.authors]]
+name = "Adam Johnson"
+email = "me@adamj.eu"
+
+[project.urls]
+Changelog = "https://github.com/adamchainz/patchy/blob/main/CHANGELOG.rst"
+Funding = "https://adamj.eu/books/"
+Repository = "https://github.com/adamchainz/patchy"
+
+[dependency-groups]
+test = [
+    "coverage[toml]",
+    "pkgutil-resolve-name; python_version<'3.9'",
+    "pytest>=9",
+    "pytest-randomly",
+]
+
+[tool.ruff.lint]
+select = [
+    "B",
+    "C4",
+    "E",
+    "F",
+    "I",
+    "SIM",
+    "TID",
+    "UP",
+    "W",
+]
+ignore = [
+    "B9",
+    "E501",
+    "SIM105",
+    "SIM108",
+]
+extend-safe-fixes = ["UP006"]
+
+[tool.ruff.lint.isort]
+required-imports = ["from __future__ import annotations"]
+
+[tool.pyproject-fmt]
+max_supported_python = "3.15"
+
+[tool.mypy]
+mypy_path = "src/"
+namespace_packages = false
+warn_unreachable = true
+enable_error_code = [
+    "ignore-without-code",
+    "redundant-expr",
+    "truthy-bool",
+]
+strict = true
+
+[[tool.mypy.overrides]]
+module = "tests.*"
+allow_untyped_defs = true
+
+[tool.pytest]
+strict = true
+
+[tool.coverage.run]
+branch = true
+data_file = ".coverage/cov"
+parallel = true
+source = [
+    "patchy",
+    "tests",
+]
+
+[tool.coverage.paths]
+source = [
+    "src",
+    ".tox/**/site-packages",
+]
+
+[tool.coverage.report]
+show_missing = true
+skip_covered = true
+skip_empty = true
+
+[tool.rstcheck]
+report_level = "ERROR"

patchy-3.0.0/pyproject.toml.orig

@@ -0,0 +1,120 @@
+[build-system]
+build-backend = "uv_build"
+requires = [
+  "uv-build>=0.12.1,<0.13",
+]
+
+[project]
+name = "patchy"
+version = "3.0.0"
+description = "Patch the inner source of python functions at runtime."
+readme = "README.rst"
+keywords = [
+  "patchy",
+]
+license = "MIT"
+license-files = [ "LICENSE" ]
+authors = [
+  { name = "Adam Johnson", email = "me@adamj.eu" },
+]
+requires-python = ">=3.10"
+classifiers = [
+  "Development Status :: 5 - Production/Stable",
+  "Intended Audience :: Developers",
+  "Natural Language :: English",
+  "Operating System :: OS Independent",
+  "Programming Language :: Python :: 3 :: Only",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
+  "Programming Language :: Python :: 3.15",
+  "Typing :: Typed",
+]
+dependencies = [
+  "unipatch",
+]
+urls = { Changelog = "https://github.com/adamchainz/patchy/blob/main/CHANGELOG.rst", Funding = "https://adamj.eu/books/", Repository = "https://github.com/adamchainz/patchy" }
+
+[dependency-groups]
+test = [
+  "coverage[toml]",
+  "pkgutil-resolve-name; python_version<'3.9'",
+  "pytest>=9",
+  "pytest-randomly",
+]
+
+[tool.ruff]
+lint.select = [
+  # flake8-bugbear
+  "B",
+  # flake8-comprehensions
+  "C4",
+  # pycodestyle
+  "E",
+  # Pyflakes errors
+  "F",
+  # isort
+  "I",
+  # flake8-simplify
+  "SIM",
+  # flake8-tidy-imports
+  "TID",
+  # pyupgrade
+  "UP",
+  # Pyflakes warnings
+  "W",
+]
+lint.ignore = [
+  # flake8-bugbear opinionated rules
+  "B9",
+  # line-too-long
+  "E501",
+  # suppressible-exception
+  "SIM105",
+  # if-else-block-instead-of-if-exp
+  "SIM108",
+]
+lint.extend-safe-fixes = [
+  # non-pep585-annotation
+  "UP006",
+]
+lint.isort.required-imports = [ "from __future__ import annotations" ]
+
+[tool.pyproject-fmt]
+max_supported_python = "3.15"
+
+[tool.mypy]
+mypy_path = "src/"
+namespace_packages = false
+warn_unreachable = true
+enable_error_code = [
+  "ignore-without-code",
+  "redundant-expr",
+  "truthy-bool",
+]
+strict = true
+overrides = [ { module = "tests.*", allow_untyped_defs = true } ]
+
+[tool.pytest]
+strict = true
+
+[tool.coverage]
+run.branch = true
+run.data_file = ".coverage/cov"
+run.parallel = true
+run.source = [
+  "patchy",
+  "tests",
+]
+paths.source = [
+  "src",
+  ".tox/**/site-packages",
+]
+report.show_missing = true
+report.skip_covered = true
+report.skip_empty = true
+
+[tool.rstcheck]
+report_level = "ERROR"

{patchy-2.9.0 → patchy-3.0.0}/src/patchy/api.py

@@ -2,20 +2,15 @@ from __future__ import annotations
 
 import ast
 import inspect
-import os
-import shutil
-import subprocess
+from collections.abc import Callable
 from functools import wraps
-from tempfile import mkdtemp
 from textwrap import dedent
-from types import CodeType
-from types import TracebackType
-from typing import Any
-from typing import Callable
-from typing import TypeVar
-from typing import cast
+from types import CodeType, TracebackType
+from typing import Any, TypeVar, cast
 from weakref import WeakKeyDictionary
 
+from unipatch import HunkApplyError, PatchError, apply_patch
+
 from .cache import PatchingCache
 
 if True:
@@ -115,44 +110,34 @@ def _apply_patch(
     except KeyError:
         pass
 
-    # Write out files
-    tempdir = mkdtemp(prefix="patchy")
     try:
-        source_path = os.path.join(tempdir, name + ".py")
-        with open(source_path, "w") as source_file:
-            source_file.write(source)
-
-        patch_path = os.path.join(tempdir, name + ".patch")
-        with open(patch_path, "w") as patch_file:
-            patch_file.write(patch_text)
-            if not patch_text.endswith("\n"):
-                patch_file.write("\n")
-
-        # Call `patch` command
-        command = ["patch", "--force"]
-        if not forwards:
-            command.append("--reverse")
-        command.extend([source_path, patch_path])
-        result = subprocess.run(command, capture_output=True, text=True)
-
-        if result.returncode != 0:
-            msg = "Could not {action} the patch {prep} '{name}'.".format(
-                action=("apply" if forwards else "unapply"),
-                prep=("to" if forwards else "from"),
-                name=name,
-            )
-            msg += " The message from `patch` was:\n{}\n{}".format(
-                result.stdout, result.stderr
-            )
-            msg += "\nThe code to patch was:\n{}\nThe patch was:\n{}".format(
-                source, patch_text
-            )
-            raise ValueError(msg)
-
-        with open(source_path) as source_file:
-            new_source = source_file.read()
-    finally:
-        shutil.rmtree(tempdir)
+        new_source = apply_patch(source, patch_text, forwards=forwards)
+    except PatchError as exc:
+        detail = str(exc)
+        if isinstance(exc, HunkApplyError):
+            try:
+                apply_patch(source, patch_text, forwards=not forwards)
+            except PatchError:
+                pass
+            else:
+                if forwards:
+                    detail += (
+                        " Applying it in reverse succeeds, so it looks like"
+                        + " the patch has already been applied."
+                    )
+                else:
+                    detail += (
+                        " Applying it forwards succeeds, so it looks like the"
+                        + " patch is unreversed and has not been applied yet."
+                    )
+        msg = "Could not {action} the patch {prep} '{name}'. {detail}".format(
+            action=("apply" if forwards else "unapply"),
+            prep=("to" if forwards else "from"),
+            name=name,
+            detail=detail,
+        )
+        msg += f"\n\nThe code to patch was:\n{source}\nThe patch was:\n{patch_text}"
+        raise ValueError(msg) from None
 
     _patching_cache.store(source, patch_text, forwards, new_source)
 
@@ -271,12 +256,8 @@ def _set_source(func: Callable[..., Any], func_source: str) -> None:
             if class_name in func.__code__.co_freevars
             else f"    global {class_name}\n"
         )
-        class_src = "{_global}    class {name}(object):\n        pass".format(
-            _global=_global, name=class_name
-        )
-        ret = "    return {class_name}.{name}".format(
-            class_name=class_name, name=func.__name__
-        )
+        class_src = f"{_global}    class {class_name}(object):\n        pass"
+        ret = f"    return {class_name}.{func.__name__}"
         to_parse = "\n".join([_def] + fv_body + [class_src, ret])
         new_source = _parse(to_parse)
         new_source.body[0].body[-2].body[0] = _ast  # type: ignore [attr-defined]
@@ -330,12 +311,10 @@ def _get_real_func(func: Callable[..., Any]) -> Callable[..., Any]:
 def _assert_ast_equal(current_source: str, expected_source: str, name: str) -> None:
     current_ast = ast.parse(current_source)
     expected_ast = ast.parse(expected_source)
-    if not ast.dump(current_ast) == ast.dump(expected_ast):
+    if ast.dump(current_ast) != ast.dump(expected_ast):
         msg = (
-            "The code of '{name}' has changed from expected.\n"
-            "The current code is:\n{current_source}\n"
-            "The expected code is:\n{expected_source}"
-        ).format(
-            name=name, current_source=current_source, expected_source=expected_source
+            f"The code of '{name}' has changed from expected.\n"
+            f"The current code is:\n{current_source}\n"
+            f"The expected code is:\n{expected_source}"
         )
         raise ValueError(msg)

patchy-2.9.0/CHANGELOG.rst

@@ -1,131 +0,0 @@
-=========
-Changelog
-=========
-
-2.9.0 (2024-10-25)
-------------------
-
-* Drop Python 3.8 support.
-
-* Support Python 3.13.
-
-2.8.0 (2023-07-10)
-------------------
-
-* Drop Python 3.7 support.
-
-2.7.0 (2023-06-16)
-------------------
-
-* Support Python 3.12.
-
-2.6.1 (2023-01-16)
-------------------
-
-* Use the ``--force`` flag to ``patch``, so it doesn’t hang waiting input for invalid reverse patches.
-  This seems to happen with the new version on macOS.
-
-2.6.0 (2022-05-11)
-------------------
-
-* Support Python 3.11.
-
-2.5.0 (2022-01-10)
-------------------
-
-* Drop Python 3.6 support.
-
-2.4.0 (2021-08-11)
-------------------
-
-* Add type hints.
-
-2.3.0 (2021-05-10)
-------------------
-
-* Support Python 3.10.
-
-* Stop distributing tests to reduce package size. Tests are not intended to be
-  run outside of the tox setup in the repository. Repackagers can use GitHub's
-  tarballs per tag.
-
-2.2.0 (2020-12-13)
-------------------
-
-* Drop Python 3.5 support.
-* Move license from BSD to MIT License.
-
-2.1.0 (2020-02-20)
-------------------
-
-* Support Python 3.9.
-* Use Python 3.9's ``pkgutil.resolve_name()``
-  (`docs <https://docs.python.org/3.9/library/pkgutil.html#pkgutil.resolve_name>`__)
-  to import names by strings, and depend on the
-  `backport package <https://pypi.org/project/pkgutil_resolve_name/>`__ on
-  older Python versions.
-
-2.0.0 (2019-11-15)
-------------------
-
-* Drop Python 2 support, only Python 3.5-3.8 is supported now. Python 3.4 was
-  dropped as it has reached its end of life.
-* Converted setuptools metadata to configuration file. This meant removing the
-  ``__version__`` attribute from the package. If you want to inspect the
-  installed version, use
-  ``importlib.metadata.version("patchy")``
-  (`docs <https://docs.python.org/3.8/library/importlib.metadata.html#distribution-versions>`__ /
-  `backport <https://pypi.org/project/importlib-metadata/>`__).
-
-1.5.0 (2019-02-15)
-------------------
-
-* Support cases where the function or class name is not in the freevars. This
-  allows patching ``__init__`` of a class, or patching a recursive module-level
-  function.
-* Support patching objects provided by dotted path string.
-
-1.4.0 (2017-05-13)
-------------------
-
-* Added new function ``patchy.replace()``, that can be used to directly assign
-  new source code to a function, without having to make a patch.
-
-1.3.2 (2017-03-13)
-------------------
-
-* Support freevars and methods that call mangled methods.
-
-1.3.1 (2016-05-24)
-------------------
-
-* Fixed ``setup.py`` to not fix the version of ``six`` required.
-* Fixed install instruction in README.
-* Added ``patchy.mc_patchface()`` as an alias for ``patchy.patch()`` because
-  memes.
-
-1.3.0 (2015-12-09)
-------------------
-
-* Remove dependency on ``pylru`` by using a simpler caching strategy
-
-1.2.0 (2015-07-23)
-------------------
-
-* Pirate mascot!
-* Patching caches the patched and unpatched versions, so unpatching and repeat
-  patching/unpatching are both faster
-* Patching doesn't attach an attribute to the function object any more
-
-1.1.0 (2015-06-16)
-------------------
-
-* Fixed code compilation to use the ``__future__`` flags from the function that
-  is being patched
-* Added ``unpatch`` method
-* Added ``temp_patch`` context manager/decorator
-
-1.0.0 (2015-06-09)
----------------------
-
-* First release on PyPI, featuring ``patch`` function.

patchy-2.9.0/MANIFEST.in

@@ -1,6 +0,0 @@
-include CHANGELOG.rst
-include LICENSE
-include pirate.png
-include pyproject.toml
-include README.rst
-include src/*/py.typed